[devel] 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

6 files changed, 36 insertions, 28 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index b31a3df68..06dd51b60 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0rc04 - December 25, 2009
+Libpng 1.4.0rc05 - December 25, 2009
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.4.0rc04.tar.xz (LZMA-compressed, recommended)
-   1.4.0rc04.tar.gz
-   1.4.0rc04.tar.bz2
+   1.4.0rc05.tar.xz (LZMA-compressed, recommended)
+   1.4.0rc05.tar.gz
+   1.4.0rc05.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp140r04.zip
-   lp140r04.7z
+   lp140r05.zip
+   lp140r05.7z
 
 Other information:
 
-   1.4.0rc04-README.txt
-   1.4.0rc04-LICENSE.txt
+   1.4.0rc05-README.txt
+   1.4.0rc05-LICENSE.txt
 
 Changes since the last public release (1.2.10):
 
@@ -751,6 +751,10 @@ version 1.4.0rc04 [December 25, 2009]
   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.
 
+version 1.4.0rc05 [December 25, 2009]
+  Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and
+    Makefile.ing to be consistent with changes in libpng-1.4.0rc03
+
 version 1.4.0 [December 25, 2009]
   No changes.
 
diff --git a/CHANGES b/CHANGES
index 7779071f2..8c43bdd3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2438,6 +2438,10 @@ version 1.4.0rc04 [December 25, 2009]
   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.
 
+version 1.4.0rc05 [December 25, 2009]
+  Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and
+    Makefile.ing to be consistent with changes in libpng-1.4.0rc03
+
 version 1.4.0 [December 25, 2009]
   No changes.
 
diff --git a/Makefile.am b/Makefile.am
index 34dcf41c6..8ccf6ee31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ EXTRA_DIST= \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.4.0rc04.txt
+	example.c libpng-1.4.0rc05.txt
 
 CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \
 libpng.sym
diff --git a/Makefile.in b/Makefile.in
index ae794f6a0..234df0abf 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
@@ -329,7 +329,7 @@ EXTRA_DIST = \
 	${srcdir}/contrib/pngsuite/* \
 	${srcdir}/contrib/visupng/* \
 	$(TESTS) \
-	example.c libpng-1.4.0rc04.txt
+	example.c libpng-1.4.0rc05.txt
 
 CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \
 libpng.sym
@@ -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 03f6843b0..4b3e9c980 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libpng 1.4.0rc04.
+# Generated by GNU Autoconf 2.65 for libpng 1.4.0rc05.
 #
 # Report bugs to <png-mng-implement@lists.sourceforge.net>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpng'
 PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.0rc04'
-PACKAGE_STRING='libpng 1.4.0rc04'
+PACKAGE_VERSION='1.4.0rc05'
+PACKAGE_STRING='libpng 1.4.0rc05'
 PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpng 1.4.0rc04 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.0rc05 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1502,7 +1502,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.4.0rc04:";;
+     short | recursive ) echo "Configuration of libpng 1.4.0rc05:";;
    esac
   cat <<\_ACEOF
 
@@ -1607,7 +1607,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpng configure 1.4.0rc04
+libpng configure 1.4.0rc05
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2032,7 +2032,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpng $as_me 1.4.0rc04, which was
+It was created by libpng $as_me 1.4.0rc05, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2840,7 +2840,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpng'
- VERSION='1.4.0rc04'
+ VERSION='1.4.0rc05'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2904,7 +2904,7 @@ fi
 
 
 
-PNGLIB_VERSION=1.4.0rc04
+PNGLIB_VERSION=1.4.0rc05
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=0
@@ -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"
 
@@ -12027,7 +12027,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpng $as_me 1.4.0rc04, which was
+This file was extended by libpng $as_me 1.4.0rc05, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12093,7 +12093,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpng config.status 1.4.0rc04
+libpng config.status 1.4.0rc05
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
@@ -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 00626a368..4c1d850e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
-AC_INIT([libpng], [1.4.0rc04], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.0rc05], [png-mng-implement@lists.sourceforge.net])
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
-PNGLIB_VERSION=1.4.0rc04
+PNGLIB_VERSION=1.4.0rc05
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=4
 PNGLIB_RELEASE=0
@@ -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])