Update libpng from 1.6.3 to 1.6.10
Change-Id: I76e81e7fd267d15991cd342c5caeb2fe77964ebf
diff --git a/configure b/configure
index 19fab5b..496d3be 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.69 for libpng 1.6.3.
+# Generated by GNU Autoconf 2.69 for libpng 1.6.10.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.6.3'
-PACKAGE_STRING='libpng 1.6.3'
+PACKAGE_VERSION='1.6.10'
+PACKAGE_STRING='libpng 1.6.10'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -637,6 +637,12 @@
LTLIBOBJS
PNG_ARM_NEON_FALSE
PNG_ARM_NEON_TRUE
+DO_INSTALL_LIBPNG_CONFIG_FALSE
+DO_INSTALL_LIBPNG_CONFIG_TRUE
+DO_INSTALL_LIBPNG_PC_FALSE
+DO_INSTALL_LIBPNG_PC_TRUE
+DO_INSTALL_LINKS_FALSE
+DO_INSTALL_LINKS_TRUE
DO_PNG_PREFIX_FALSE
DO_PNG_PREFIX_TRUE
PNG_PREFIX
@@ -794,6 +800,9 @@
with_pkgconfigdir
with_binconfigs
with_libpng_prefix
+enable_unversioned_links
+enable_unversioned_libpng_pc
+enable_unversioned_libpng_config
enable_arm_neon
'
ac_precious_vars='build_alias
@@ -1348,7 +1357,7 @@
# 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.6.3 to adapt to many kinds of systems.
+\`configure' configures libpng 1.6.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1418,7 +1427,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.6.3:";;
+ short | recursive ) echo "Configuration of libpng 1.6.10:";;
esac
cat <<\_ACEOF
@@ -1442,6 +1451,34 @@
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-werror[=OPT] Pass -Werror or the given argument to the compiler
if it is supported
+ --enable-unversioned-links
+ Installed libpng header files are placed in a
+ versioned subdirectory and installed libpng library
+ (including DLL) files are versioned. If this option
+ is enabled unversioned links will be created
+ pointing to the corresponding installed files. If
+ you use libpng.pc or libpng-config for all builds
+ you do not need these links, but if you compile
+ programs directly they will typically #include
+ <png.h> and link with -lpng; in that case you need
+ the links. The links can be installed manually using
+ 'make install-header-links' and 'make
+ install-library-links' and can be removed using the
+ corresponding uninstall- targets. If you do enable
+ this option every libpng 'make install' will
+ recreate the links to point to the just installed
+ version of libpng. The default is to create the
+ links; use --disable-unversioned-links to change
+ this
+ --enable-unversioned-libpng-pc
+ Install the configuration file 'libpng.pc' as a link
+ to the versioned version. This is done by default -
+ use --disable-unversioned-libpng-pc to change this.
+ --enable-unversioned-libpng-config
+ Install the configuration file 'libpng-config' as a
+ link to the versioned version. This is done by
+ default - use --disable-unversioned-libpng-config to
+ change this.
--enable-arm-neon Enable ARM NEON optimizations: =no/off, check, api,
yes/on: no/off: disable the optimizations; check:
use internal checking code (deprecated and poorly
@@ -1546,7 +1583,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.6.3
+libpng configure 1.6.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1878,7 +1915,7 @@
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.6.3, which was
+It was created by libpng $as_me 1.6.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2234,7 +2271,7 @@
# dist-xz requires automake 1.11 or later
# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
# 1.13 is required for parallel tests
-am__api_version='1.13'
+am__api_version='1.14'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2749,7 +2786,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.6.3'
+ VERSION='1.6.10'
cat >>confdefs.h <<_ACEOF
@@ -2789,12 +2826,58 @@
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
# The following line causes --disable-maintainer-mode to be the default to
# configure, this is necessary because libpng distributions cannot rely on the
# time stamps of the autotools generated files being correct
@@ -2823,10 +2906,10 @@
-PNGLIB_VERSION=1.6.3
+PNGLIB_VERSION=1.6.10
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
-PNGLIB_RELEASE=3
+PNGLIB_RELEASE=10
@@ -3628,6 +3711,65 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -12731,6 +12873,54 @@
fi
+# Control over what links are made for installed files. Versioned files are
+# always installed, when the following options are turned on corresponding
+# unversioned links are also created (normally as symbolic links):
+# Check whether --enable-unversioned-links was given.
+if test "${enable_unversioned_links+set}" = set; then :
+ enableval=$enable_unversioned_links;
+fi
+
+
+# The AM_CONDITIONAL test is written so that the default is enabled;
+# --disable-unversioned-links must be given to turn the option off.
+ if test "$enable_unversioned_links" != "no"; then
+ DO_INSTALL_LINKS_TRUE=
+ DO_INSTALL_LINKS_FALSE='#'
+else
+ DO_INSTALL_LINKS_TRUE='#'
+ DO_INSTALL_LINKS_FALSE=
+fi
+
+
+# Check whether --enable-unversioned-libpng-pc was given.
+if test "${enable_unversioned_libpng_pc+set}" = set; then :
+ enableval=$enable_unversioned_libpng_pc;
+fi
+
+ if test "$enable_unversioned_libpng_pc" != "no"; then
+ DO_INSTALL_LIBPNG_PC_TRUE=
+ DO_INSTALL_LIBPNG_PC_FALSE='#'
+else
+ DO_INSTALL_LIBPNG_PC_TRUE='#'
+ DO_INSTALL_LIBPNG_PC_FALSE=
+fi
+
+
+# Check whether --enable-unversioned-libpng-config was given.
+if test "${enable_unversioned_libpng_config+set}" = set; then :
+ enableval=$enable_unversioned_libpng_config;
+fi
+
+ if test "$enable_unversioned_libpng_config" != "no"; then
+ DO_INSTALL_LIBPNG_CONFIG_TRUE=
+ DO_INSTALL_LIBPNG_CONFIG_FALSE='#'
+else
+ DO_INSTALL_LIBPNG_CONFIG_TRUE='#'
+ DO_INSTALL_LIBPNG_CONFIG_FALSE=
+fi
+
+
# HOST SPECIFIC OPTIONS
# =====================
#
@@ -12952,6 +13142,18 @@
as_fn_error $? "conditional \"DO_PNG_PREFIX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${DO_INSTALL_LINKS_TRUE}" && test -z "${DO_INSTALL_LINKS_FALSE}"; then
+ as_fn_error $? "conditional \"DO_INSTALL_LINKS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DO_INSTALL_LIBPNG_PC_TRUE}" && test -z "${DO_INSTALL_LIBPNG_PC_FALSE}"; then
+ as_fn_error $? "conditional \"DO_INSTALL_LIBPNG_PC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DO_INSTALL_LIBPNG_CONFIG_TRUE}" && test -z "${DO_INSTALL_LIBPNG_CONFIG_FALSE}"; then
+ as_fn_error $? "conditional \"DO_INSTALL_LIBPNG_CONFIG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${PNG_ARM_NEON_TRUE}" && test -z "${PNG_ARM_NEON_FALSE}"; then
as_fn_error $? "conditional \"PNG_ARM_NEON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -13353,7 +13555,7 @@
# 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.6.3, which was
+This file was extended by libpng $as_me 1.6.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13419,7 +13621,7 @@
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.6.3
+libpng config.status 1.6.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -14480,7 +14682,7 @@
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the