diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 84 |
1 files changed, 54 insertions, 30 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.15beta06. +# Generated by GNU Autoconf 2.69 for libpng 1.5.16beta06. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.15beta06' -PACKAGE_STRING='libpng 1.5.15beta06' +PACKAGE_VERSION='1.5.16beta06' +PACKAGE_STRING='libpng 1.5.16beta06' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -637,7 +637,6 @@ am__EXEEXT_TRUE LTLIBOBJS PNG_ARM_NEON_FALSE PNG_ARM_NEON_TRUE -AM_CCASFLAGS binconfigs pkgconfigdir PNGLIB_RELEASE @@ -1343,7 +1342,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.5.15beta06 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.16beta06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1412,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.15beta06:";; + short | recursive ) echo "Configuration of libpng 1.5.16beta06:";; esac cat <<\_ACEOF @@ -1435,8 +1434,12 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-arm-neon Enable ARM NEON optimizations: use 'always' to turn - off run-time checks + --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 + supported); api: disable by default, enable by a + call to png_set_option; yes/on: turn on + unconditionally. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1530,7 +1533,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.15beta06 +libpng configure 1.5.16beta06 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1953,7 +1956,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.5.15beta06, which was +It was created by libpng $as_me 1.5.16beta06, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2816,7 +2819,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.15beta06' + VERSION='1.5.16beta06' cat >>confdefs.h <<_ACEOF @@ -2886,10 +2889,10 @@ fi -PNGLIB_VERSION=1.5.15beta06 +PNGLIB_VERSION=1.5.16beta06 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=15 +PNGLIB_RELEASE=16 @@ -12804,30 +12807,51 @@ fi -# Because GCC by default assembles code with an executable stack, even though it -# compiles C code with a non-executable stack, it is necessary to do a fixup -# here (this may by GCC specific) -AM_CCASFLAGS=-Wa,--noexecstack - +# HOST SPECIFIC OPTIONS +# ===================== +# +# ARM +# === +# +# ARM NEON (SIMD) support. # Check whether --enable-arm-neon was given. if test "${enable_arm_neon+set}" = set; then : - enableval=$enable_arm_neon; if test "${enableval}" = "yes" -o "${enableval}" = "always"; then - -$as_echo "#define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon" >>confdefs.h + enableval=$enable_arm_neon; case "$enableval" in + no|off) + # disable the default enabling on __ARM_NEON__ systems: +$as_echo "#define PNG_NO_ARM_NEON /**/" >>confdefs.h -$as_echo "#define PNG_ALIGNED_MEMORY_SUPPORTED 1" >>confdefs.h + # Prevent inclusion of the assembler files below: + enable_arm_neon=no;; + check) - if test "${enableval}" = "always"; then +$as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h +;; + api) -$as_echo "#define PNG_NO_ARM_NEON_CHECK /**/" >>confdefs.h +$as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h +;; + yes|on) - fi - fi +$as_echo "#define PNG_ARM_NEON_SUPPORTED /**/" >>confdefs.h +;; + *) + as_fn_error $? "--enable-arm-neon=${enable_arm_neon}: invalid value" "$LINENO" 5 + esac fi - if test "${enable_arm_neon:-no}" != "no"; then + +# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or +# where ARM optimizations were explicitly requested (this allows a fallback if a +# future host CPU does not match 'arm*') + + if test "$enable_arm_neon" != 'no' && + case "$host_cpu" in + arm*) :;; + *) test "$enable_arm_neon" != '';; + esac; then PNG_ARM_NEON_TRUE= PNG_ARM_NEON_FALSE='#' else @@ -12836,7 +12860,7 @@ else fi - { $as_echo "$as_me:${as_lineno-$LINENO}: Extra options for compiler: $PNG_COPTS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: Extra options for compiler: $PNG_COPTS" >&5 $as_echo "$as_me: Extra options for compiler: $PNG_COPTS" >&6;} # Config files, substituting as above @@ -13395,7 +13419,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.5.15beta06, which was +This file was extended by libpng $as_me 1.5.16beta06, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13461,7 +13485,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.5.15beta06 +libpng config.status 1.5.16beta06 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |