diff --git a/ANNOUNCE b/ANNOUNCE index 4539b30c6..a7b284bd2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -63,6 +63,8 @@ version 1.5.0alpha01 [December 25, 2009] (revising the change in 1.4.0beta99) Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngset.c to be consistent with other changes in version 1.2.38. + Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and + Makefile.in to be consistent with changes in libpng-1.4.0rc03 Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a3517e754..27b9aa759 100644 --- a/CHANGES +++ b/CHANGES @@ -2445,6 +2445,8 @@ version 1.5.0alpha01 [December 25, 2009] (revising the change in 1.4.0beta99) Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngset.c to be consistent with other changes in version 1.2.38. + Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and + Makefile.in to be consistent with changes in libpng-1.4.0rc03 Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/Makefile.in b/Makefile.in index 865ff7117..651645f01 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,7 +53,7 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/libpng-config.in $(srcdir)/libpng-pc.in \ + $(srcdir)/libpng-config.in $(srcdir)/libpng.pc.in \ $(top_srcdir)/configure INSTALL TODO config.guess config.sub \ depcomp install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -393,7 +393,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -libpng.pc: $(top_builddir)/config.status $(srcdir)/libpng-pc.in +libpng.pc: $(top_builddir)/config.status $(srcdir)/libpng.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ libpng-config: $(top_builddir)/config.status $(srcdir)/libpng-config.in cd $(top_builddir) && $(SHELL) ./config.status $@ diff --git a/configure b/configure index 42932a10c..3a543de6c 100755 --- a/configure +++ b/configure @@ -11493,7 +11493,7 @@ fi # Config files, substituting as above -ac_config_files="$ac_config_files Makefile libpng.pc:libpng-pc.in" +ac_config_files="$ac_config_files Makefile libpng.pc:libpng.pc.in" ac_config_files="$ac_config_files libpng-config:libpng-config.in" @@ -12476,7 +12476,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng-pc.in" ;; + "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng.pc.in" ;; "libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:libpng-config.in" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index 76f7e8301..3947ea0cd 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,7 @@ AC_ARG_WITH(binconfigs, AC_SUBST([binconfigs]) # Config files, substituting as above -AC_CONFIG_FILES([Makefile libpng.pc:libpng-pc.in]) +AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in]) AC_CONFIG_FILES([libpng-config:libpng-config.in], [chmod +x libpng-config])