| Index: configure
|
| diff --git a/configure b/configure
|
| index c6cb40a3aafd0e6a7ce4b1ed1a7994ca9c7db99c..13323ed400208292352a6527867ed7e1db029d97 100755
|
| --- a/configure
|
| +++ b/configure
|
| @@ -1,13 +1,11 @@
|
| #! /bin/sh
|
| # Guess values for system-dependent variables and create Makefiles.
|
| -# Generated by GNU Autoconf 2.68 for opus 1.1.
|
| +# Generated by GNU Autoconf 2.69 for opus 1.1.1-beta-24-g66611f1.
|
| #
|
| # Report bugs to <opus@xiph.org>.
|
| #
|
| #
|
| -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
| -# Foundation, Inc.
|
| +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
| #
|
| #
|
| # This configure script is free software; the Free Software Foundation
|
| @@ -136,6 +134,31 @@ export LANGUAGE
|
| # CDPATH.
|
| (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
| +# Use a proper internal environment variable to ensure we don't fall
|
| + # into an infinite loop, continuously re-executing ourselves.
|
| + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
|
| + _as_can_reexec=no; export _as_can_reexec;
|
| + # We cannot yet assume a decent shell, so we have to provide a
|
| +# neutralization value for shells without unset; and this also
|
| +# works around shells that cannot unset nonexistent variables.
|
| +# Preserve -v and -x to the replacement shell.
|
| +BASH_ENV=/dev/null
|
| +ENV=/dev/null
|
| +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
| +case $- in # ((((
|
| + *v*x* | *x*v* ) as_opts=-vx ;;
|
| + *v* ) as_opts=-v ;;
|
| + *x* ) as_opts=-x ;;
|
| + * ) as_opts= ;;
|
| +esac
|
| +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
|
| +# Admittedly, this is quite paranoid, since all the known shells bail
|
| +# out after a failed `exec'.
|
| +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
|
| +as_fn_exit 255
|
| + fi
|
| + # We don't want this to propagate to other subprocesses.
|
| + { _as_can_reexec=; unset _as_can_reexec;}
|
| if test "x$CONFIG_SHELL" = x; then
|
| as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
| emulate sh
|
| @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
|
| else
|
| exitcode=1; echo positional parameters were not saved.
|
| fi
|
| -test x\$exitcode = x0 || exit 1"
|
| +test x\$exitcode = x0 || exit 1
|
| +test -x / || exit 1"
|
| as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
| as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
| eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
| @@ -222,21 +246,25 @@ IFS=$as_save_IFS
|
|
|
|
|
| if test "x$CONFIG_SHELL" != x; then :
|
| - # We cannot yet assume a decent shell, so we have to provide a
|
| - # neutralization value for shells without unset; and this also
|
| - # works around shells that cannot unset nonexistent variables.
|
| - # Preserve -v and -x to the replacement shell.
|
| - BASH_ENV=/dev/null
|
| - ENV=/dev/null
|
| - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
| - export CONFIG_SHELL
|
| - case $- in # ((((
|
| - *v*x* | *x*v* ) as_opts=-vx ;;
|
| - *v* ) as_opts=-v ;;
|
| - *x* ) as_opts=-x ;;
|
| - * ) as_opts= ;;
|
| - esac
|
| - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
|
| + export CONFIG_SHELL
|
| + # We cannot yet assume a decent shell, so we have to provide a
|
| +# neutralization value for shells without unset; and this also
|
| +# works around shells that cannot unset nonexistent variables.
|
| +# Preserve -v and -x to the replacement shell.
|
| +BASH_ENV=/dev/null
|
| +ENV=/dev/null
|
| +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
| +case $- in # ((((
|
| + *v*x* | *x*v* ) as_opts=-vx ;;
|
| + *v* ) as_opts=-v ;;
|
| + *x* ) as_opts=-x ;;
|
| + * ) as_opts= ;;
|
| +esac
|
| +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
|
| +# Admittedly, this is quite paranoid, since all the known shells bail
|
| +# out after a failed `exec'.
|
| +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
|
| +exit 255
|
| fi
|
|
|
| if test x$as_have_required = xno; then :
|
| @@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
|
|
|
|
|
| } # as_fn_mkdir_p
|
| +
|
| +# as_fn_executable_p FILE
|
| +# -----------------------
|
| +# Test if FILE is an executable regular file.
|
| +as_fn_executable_p ()
|
| +{
|
| + test -f "$1" && test -x "$1"
|
| +} # as_fn_executable_p
|
| # as_fn_append VAR VALUE
|
| # ----------------------
|
| # Append the text in VALUE to the end of the definition contained in VAR. Take
|
| @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
|
| chmod +x "$as_me.lineno" ||
|
| { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
|
|
| + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
|
| + # already done that, so ensure we don't try to do so again and fall
|
| + # in an infinite loop. This has already happened in practice.
|
| + _as_can_reexec=no; export _as_can_reexec
|
| # Don't try to exec as it changes $[0], causing all sort of problems
|
| # (the dirname of $[0] is not the place where we might find the
|
| # original and so on. Autoconf is especially sensitive to this).
|
| @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
|
| # ... but there are two gotchas:
|
| # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
| # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
| - # In both cases, we have to default to `cp -p'.
|
| + # In both cases, we have to default to `cp -pR'.
|
| ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
| - as_ln_s='cp -p'
|
| + as_ln_s='cp -pR'
|
| elif ln conf$$.file conf$$ 2>/dev/null; then
|
| as_ln_s=ln
|
| else
|
| - as_ln_s='cp -p'
|
| + as_ln_s='cp -pR'
|
| fi
|
| else
|
| - as_ln_s='cp -p'
|
| + as_ln_s='cp -pR'
|
| fi
|
| rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
| rmdir conf$$.dir 2>/dev/null
|
| @@ -515,28 +555,8 @@ else
|
| as_mkdir_p=false
|
| fi
|
|
|
| -if test -x / >/dev/null 2>&1; then
|
| - as_test_x='test -x'
|
| -else
|
| - if ls -dL / >/dev/null 2>&1; then
|
| - as_ls_L_option=L
|
| - else
|
| - as_ls_L_option=
|
| - fi
|
| - as_test_x='
|
| - eval sh -c '\''
|
| - if test -d "$1"; then
|
| - test -d "$1/.";
|
| - else
|
| - case $1 in #(
|
| - -*)set "./$1";;
|
| - esac;
|
| - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
| - ???[sx]*):;;*)false;;esac;fi
|
| - '\'' sh
|
| - '
|
| -fi
|
| -as_executable_p=$as_test_x
|
| +as_test_x='test -x'
|
| +as_executable_p=as_fn_executable_p
|
|
|
| # Sed expression to map a string onto a valid CPP name.
|
| as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
| @@ -570,8 +590,8 @@ MAKEFLAGS=
|
| # Identity of this package.
|
| PACKAGE_NAME='opus'
|
| PACKAGE_TARNAME='opus'
|
| -PACKAGE_VERSION='1.1'
|
| -PACKAGE_STRING='opus 1.1'
|
| +PACKAGE_VERSION='1.1.1-beta-24-g66611f1'
|
| +PACKAGE_STRING='opus 1.1.1-beta-24-g66611f1'
|
| PACKAGE_BUGREPORT='opus@xiph.org'
|
| PACKAGE_URL=''
|
|
|
| @@ -623,8 +643,15 @@ HAVE_DOXYGEN_FALSE
|
| HAVE_DOXYGEN_TRUE
|
| HAVE_DOXYGEN
|
| OPUS_HAVE_RTCD
|
| +OPUS_ARM_NEON_INTR_FALSE
|
| +OPUS_ARM_NEON_INTR_TRUE
|
| CPU_ARM_FALSE
|
| CPU_ARM_TRUE
|
| +HAVE_SSE2_FALSE
|
| +HAVE_SSE2_TRUE
|
| +HAVE_SSE4_1_FALSE
|
| +HAVE_SSE4_1_TRUE
|
| +ARM2GNU_PARAMS
|
| OPUS_ARM_MAY_HAVE_NEON
|
| OPUS_ARM_MAY_HAVE_MEDIA
|
| OPUS_ARM_MAY_HAVE_EDSP
|
| @@ -783,6 +810,7 @@ enable_custom_modes
|
| enable_float_approx
|
| enable_asm
|
| enable_rtcd
|
| +enable_intrinsics
|
| enable_assertions
|
| enable_fuzzing
|
| enable_doc
|
| @@ -1254,8 +1282,6 @@ target=$target_alias
|
| if test "x$host_alias" != x; then
|
| if test "x$build_alias" = x; then
|
| cross_compiling=maybe
|
| - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
| - If a cross compiler is detected then cross compile mode will be used" >&2
|
| elif test "x$build_alias" != "x$host_alias"; then
|
| cross_compiling=yes
|
| fi
|
| @@ -1341,7 +1367,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 opus 1.1 to adapt to many kinds of systems.
|
| +\`configure' configures opus 1.1.1-beta-24-g66611f1 to adapt to many kinds of systems.
|
|
|
| Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
| @@ -1411,7 +1437,7 @@ fi
|
|
|
| if test -n "$ac_init_help"; then
|
| case $ac_init_help in
|
| - short | recursive ) echo "Configuration of opus 1.1:";;
|
| + short | recursive ) echo "Configuration of opus 1.1.1-beta-24-g66611f1:";;
|
| esac
|
| cat <<\_ACEOF
|
|
|
| @@ -1419,16 +1445,19 @@ Optional Features:
|
| --disable-option-checking ignore unrecognized --enable/--with options
|
| --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
| --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
| - --enable-silent-rules less verbose build output (undo: `make V=1')
|
| - --disable-silent-rules verbose build output (undo: `make V=0')
|
| - --disable-maintainer-mode disable make rules and dependencies not useful
|
| - (and sometimes confusing) to the casual installer
|
| + --enable-silent-rules less verbose build output (undo: "make V=1")
|
| + --disable-silent-rules verbose build output (undo: "make V=0")
|
| + --disable-maintainer-mode
|
| + disable make rules and dependencies not useful (and
|
| + sometimes confusing) to the casual installer
|
| --enable-shared[=PKGS] build shared libraries [default=yes]
|
| --enable-static[=PKGS] build static libraries [default=yes]
|
| --enable-fast-install[=PKGS]
|
| optimize for fast installation [default=yes]
|
| - --disable-dependency-tracking speeds up one-time build
|
| - --enable-dependency-tracking do not reject slow dependency extractors
|
| + --enable-dependency-tracking
|
| + do not reject slow dependency extractors
|
| + --disable-dependency-tracking
|
| + speeds up one-time build
|
| --disable-libtool-lock avoid locking (might break parallel builds)
|
| --enable-fixed-point compile without floating point (for machines without
|
| a fast enough FPU)
|
| @@ -1440,6 +1469,8 @@ Optional Features:
|
| --enable-float-approx enable fast approximations for floating point
|
| --disable-asm Disable assembly optimizations
|
| --disable-rtcd Disable run-time CPU capabilities detection
|
| + --enable-intrinsics Enable intrinsics optimizations for ARM(float)
|
| + X86(fixed)
|
| --enable-assertions enable additional software error checking
|
| --enable-fuzzing causes the encoder to make random decisions
|
| --disable-doc Do not build API documentation
|
| @@ -1533,10 +1564,10 @@ fi
|
| test -n "$ac_init_help" && exit $ac_status
|
| if $ac_init_version; then
|
| cat <<\_ACEOF
|
| -opus configure 1.1
|
| -generated by GNU Autoconf 2.68
|
| +opus configure 1.1.1-beta-24-g66611f1
|
| +generated by GNU Autoconf 2.69
|
|
|
| -Copyright (C) 2010 Free Software Foundation, Inc.
|
| +Copyright (C) 2012 Free Software Foundation, Inc.
|
| This configure script is free software; the Free Software Foundation
|
| gives unlimited permission to copy, distribute and modify it.
|
| _ACEOF
|
| @@ -1612,7 +1643,7 @@ $as_echo "$ac_try_echo"; } >&5
|
| test ! -s conftest.err
|
| } && test -s conftest$ac_exeext && {
|
| test "$cross_compiling" = yes ||
|
| - $as_test_x conftest$ac_exeext
|
| + test -x conftest$ac_exeext
|
| }; then :
|
| ac_retval=0
|
| else
|
| @@ -1902,8 +1933,8 @@ 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 opus $as_me 1.1, which was
|
| -generated by GNU Autoconf 2.68. Invocation command line was
|
| +It was created by opus $as_me 1.1.1-beta-24-g66611f1, which was
|
| +generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
| $ $0 $@
|
|
|
| @@ -2259,10 +2290,10 @@ if test "${enable_silent_rules+set}" = set; then :
|
| enableval=$enable_silent_rules;
|
| fi
|
|
|
| -case $enable_silent_rules in
|
| -yes) AM_DEFAULT_VERBOSITY=0;;
|
| -no) AM_DEFAULT_VERBOSITY=1;;
|
| -*) AM_DEFAULT_VERBOSITY=0;;
|
| +case $enable_silent_rules in # (((
|
| + yes) AM_DEFAULT_VERBOSITY=0;;
|
| + no) AM_DEFAULT_VERBOSITY=1;;
|
| + *) AM_DEFAULT_VERBOSITY=0;;
|
| esac
|
| am_make=${MAKE-make}
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
|
| @@ -2303,7 +2334,7 @@ OPUS_LT_AGE=5
|
|
|
|
|
|
|
| -am__api_version='1.11'
|
| +am__api_version='1.14'
|
|
|
| ac_aux_dir=
|
| for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
| @@ -2371,7 +2402,7 @@ case $as_dir/ in #((
|
| # by default.
|
| for ac_prog in ginstall scoinst install; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
| if test $ac_prog = install &&
|
| grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
| # AIX install. It has an incompatible calling convention.
|
| @@ -2429,9 +2460,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
|
| $as_echo_n "checking whether build environment is sane... " >&6; }
|
| -# Just in case
|
| -sleep 1
|
| -echo timestamp > conftest.file
|
| # Reject unsafe characters in $srcdir or the absolute working directory
|
| # name. Accept space and tab only in the latter.
|
| am_lf='
|
| @@ -2442,32 +2470,40 @@ case `pwd` in
|
| esac
|
| case $srcdir in
|
| *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
|
| - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
|
| + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
|
| esac
|
|
|
| -# Do `set' in a subshell so we don't clobber the current shell's
|
| +# Do 'set' in a subshell so we don't clobber the current shell's
|
| # arguments. Must try -L first in case configure is actually a
|
| # symlink; some systems play weird games with the mod time of symlinks
|
| # (eg FreeBSD returns the mod time of the symlink's containing
|
| # directory).
|
| if (
|
| - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
| - if test "$*" = "X"; then
|
| - # -L didn't work.
|
| - set X `ls -t "$srcdir/configure" conftest.file`
|
| - fi
|
| - rm -f conftest.file
|
| - if test "$*" != "X $srcdir/configure conftest.file" \
|
| - && test "$*" != "X conftest.file $srcdir/configure"; then
|
| -
|
| - # If neither matched, then we have a broken ls. This can happen
|
| - # if, for instance, CONFIG_SHELL is bash and it inherits a
|
| - # broken ls alias from the environment. This has actually
|
| - # happened. Such a system could not be considered "sane".
|
| - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
|
| -alias in your environment" "$LINENO" 5
|
| - fi
|
| -
|
| + am_has_slept=no
|
| + for am_try in 1 2; do
|
| + echo "timestamp, slept: $am_has_slept" > conftest.file
|
| + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
| + if test "$*" = "X"; then
|
| + # -L didn't work.
|
| + set X `ls -t "$srcdir/configure" conftest.file`
|
| + fi
|
| + if test "$*" != "X $srcdir/configure conftest.file" \
|
| + && test "$*" != "X conftest.file $srcdir/configure"; then
|
| +
|
| + # If neither matched, then we have a broken ls. This can happen
|
| + # if, for instance, CONFIG_SHELL is bash and it inherits a
|
| + # broken ls alias from the environment. This has actually
|
| + # happened. Such a system could not be considered "sane".
|
| + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
|
| + alias in your environment" "$LINENO" 5
|
| + fi
|
| + if test "$2" = conftest.file || test $am_try -eq 2; then
|
| + break
|
| + fi
|
| + # Just in case.
|
| + sleep 1
|
| + am_has_slept=yes
|
| + done
|
| test "$2" = conftest.file
|
| )
|
| then
|
| @@ -2479,6 +2515,16 @@ Check your system clock" "$LINENO" 5
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| $as_echo "yes" >&6; }
|
| +# If we didn't sleep, we still need to ensure time stamps of config.status and
|
| +# generated files are strictly newer.
|
| +am_sleep_pid=
|
| +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
|
| + ( sleep 1 ) &
|
| + am_sleep_pid=$!
|
| +fi
|
| +
|
| +rm -f conftest.file
|
| +
|
| test "$program_prefix" != NONE &&
|
| program_transform_name="s&^&$program_prefix&;$program_transform_name"
|
| # Use a double $ so make ignores it.
|
| @@ -2501,12 +2547,12 @@ if test x"${MISSING+set}" != xset; then
|
| esac
|
| fi
|
| # Use eval to expand $SHELL
|
| -if eval "$MISSING --run true"; then
|
| - am_missing_run="$MISSING --run "
|
| +if eval "$MISSING --is-lightweight"; then
|
| + am_missing_run="$MISSING "
|
| else
|
| am_missing_run=
|
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
|
| -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
|
| +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
|
| fi
|
|
|
| if test x"${install_sh}" != xset; then
|
| @@ -2518,10 +2564,10 @@ if test x"${install_sh}" != xset; then
|
| esac
|
| fi
|
|
|
| -# Installed binaries are usually stripped using `strip' when the user
|
| -# run `make install-strip'. However `strip' might not be the right
|
| +# Installed binaries are usually stripped using 'strip' when the user
|
| +# run "make install-strip". However 'strip' might not be the right
|
| # tool to use in cross-compilation environments, therefore Automake
|
| -# will honor the `STRIP' environment variable to overrule this program.
|
| +# will honor the 'STRIP' environment variable to overrule this program.
|
| if test "$cross_compiling" != no; then
|
| if test -n "$ac_tool_prefix"; then
|
| # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
| @@ -2540,7 +2586,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -2580,7 +2626,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_STRIP="strip"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -2631,7 +2677,7 @@ do
|
| test -z "$as_dir" && as_dir=.
|
| for ac_prog in mkdir gmkdir; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
| + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
|
| case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
| 'mkdir (GNU coreutils) '* | \
|
| 'mkdir (coreutils) '* | \
|
| @@ -2660,12 +2706,6 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
|
| $as_echo "$MKDIR_P" >&6; }
|
|
|
| -mkdir_p="$MKDIR_P"
|
| -case $mkdir_p in
|
| - [\\/$]* | ?:[\\/]*) ;;
|
| - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
|
| -esac
|
| -
|
| for ac_prog in gawk mawk nawk awk
|
| do
|
| # Extract the first word of "$ac_prog", so it can be a program name with args.
|
| @@ -2684,7 +2724,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_AWK="$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -2770,7 +2810,7 @@ fi
|
|
|
| # Define the identity of the package.
|
| PACKAGE='opus'
|
| - VERSION='1.1'
|
| + VERSION='1.1.1-beta-24-g66611f1'
|
|
|
|
|
| # Some tools Automake needs.
|
| @@ -2789,12 +2829,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
|
|
|
| MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
|
|
| +# For better backward compatibility. To be removed once Automake 1.9.x
|
| +# dies out for good. For more background, see:
|
| +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
| +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
| +mkdir_p='$(MKDIR_P)'
|
| +
|
| # We need awk for the "check" target. The system "awk" is bad on
|
| # some platforms.
|
| # Always define AMTAR for backward compatibility. Yes, it's still used
|
| # 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 -'
|
|
|
|
|
| @@ -2802,6 +2852,48 @@ 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
|
| +
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
| $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
|
| # Check whether --enable-maintainer-mode was given.
|
| @@ -3015,7 +3107,7 @@ am__quote=
|
| _am_result=none
|
| # First try GNU make style include.
|
| echo "include confinc" > confmf
|
| -# Ignore all kinds of additional output from `make'.
|
| +# Ignore all kinds of additional output from 'make'.
|
| case `$am_make -s -f confmf 2> /dev/null` in #(
|
| *the\ am__doit\ target*)
|
| am__include=include
|
| @@ -3081,7 +3173,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -3121,7 +3213,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_CC="gcc"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -3174,7 +3266,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_CC="${ac_tool_prefix}cc"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -3215,7 +3307,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
| ac_prog_rejected=yes
|
| continue
|
| @@ -3273,7 +3365,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -3317,7 +3409,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_CC="$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -3763,8 +3855,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| #include <stdarg.h>
|
| #include <stdio.h>
|
| -#include <sys/types.h>
|
| -#include <sys/stat.h>
|
| +struct stat;
|
| /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
| struct buf { int x; };
|
| FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
| @@ -3849,6 +3940,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
|
| +
|
| +
|
| depcc="$CC" am_compiler_list=
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
|
| @@ -3860,8 +4010,8 @@ else
|
| # We make a subdir and do the tests there. Otherwise we can end up
|
| # making bogus files that we don't know about and never remove. For
|
| # instance it was reported that on HP-UX the gcc test will end up
|
| - # making a dummy file named `D' -- because `-MD' means `put the output
|
| - # in D'.
|
| + # making a dummy file named 'D' -- because '-MD' means "put the output
|
| + # in D".
|
| rm -rf conftest.dir
|
| mkdir conftest.dir
|
| # Copy depcomp to subdir because otherwise we won't find it if we're
|
| @@ -3896,16 +4046,16 @@ else
|
| : > sub/conftest.c
|
| for i in 1 2 3 4 5 6; do
|
| echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
| - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
| - # Solaris 8's {/usr,}/bin/sh.
|
| - touch sub/conftst$i.h
|
| + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
|
| + # Solaris 10 /bin/sh.
|
| + echo '/* dummy */' > sub/conftst$i.h
|
| done
|
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
| - # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
| + # We check with '-c' and '-o' for the sake of the "dashmstdout"
|
| # mode. It turns out that the SunPro C++ compiler does not properly
|
| - # handle `-M -o', and we need to detect this. Also, some Intel
|
| - # versions had trouble with output in subdirs
|
| + # handle '-M -o', and we need to detect this. Also, some Intel
|
| + # versions had trouble with output in subdirs.
|
| am__obj=sub/conftest.${OBJEXT-o}
|
| am__minus_obj="-o $am__obj"
|
| case $depmode in
|
| @@ -3914,8 +4064,8 @@ else
|
| test "$am__universal" = false || continue
|
| ;;
|
| nosideeffect)
|
| - # after this tag, mechanisms are not by side-effect, so they'll
|
| - # only be used when explicitly requested
|
| + # After this tag, mechanisms are not by side-effect, so they'll
|
| + # only be used when explicitly requested.
|
| if test "x$enable_dependency_tracking" = xyes; then
|
| continue
|
| else
|
| @@ -3923,7 +4073,7 @@ else
|
| fi
|
| ;;
|
| msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
| - # This compiler won't grok `-c -o', but also, the minuso test has
|
| + # This compiler won't grok '-c -o', but also, the minuso test has
|
| # not run yet. These depmodes are late enough in the game, and
|
| # so weak that their functioning should not be impacted.
|
| am__obj=conftest.${OBJEXT-o}
|
| @@ -3999,7 +4149,7 @@ do
|
| for ac_prog in sed gsed; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
| - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
| + as_fn_executable_p "$ac_path_SED" || continue
|
| # Check for GNU ac_path_SED and select it if it is found.
|
| # Check for GNU $ac_path_SED
|
| case `"$ac_path_SED" --version 2>&1` in
|
| @@ -4075,7 +4225,7 @@ do
|
| for ac_prog in grep ggrep; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
| - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
| + as_fn_executable_p "$ac_path_GREP" || continue
|
| # Check for GNU ac_path_GREP and select it if it is found.
|
| # Check for GNU $ac_path_GREP
|
| case `"$ac_path_GREP" --version 2>&1` in
|
| @@ -4141,7 +4291,7 @@ do
|
| for ac_prog in egrep; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
| - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
| + as_fn_executable_p "$ac_path_EGREP" || continue
|
| # Check for GNU ac_path_EGREP and select it if it is found.
|
| # Check for GNU $ac_path_EGREP
|
| case `"$ac_path_EGREP" --version 2>&1` in
|
| @@ -4208,7 +4358,7 @@ do
|
| for ac_prog in fgrep; do
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
|
| - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
|
| + as_fn_executable_p "$ac_path_FGREP" || continue
|
| # Check for GNU ac_path_FGREP and select it if it is found.
|
| # Check for GNU $ac_path_FGREP
|
| case `"$ac_path_FGREP" --version 2>&1` in
|
| @@ -4464,7 +4614,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -4508,7 +4658,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -4697,7 +4847,8 @@ else
|
| ;;
|
| *)
|
| lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
|
| - if test -n "$lt_cv_sys_max_cmd_len"; then
|
| + if test -n "$lt_cv_sys_max_cmd_len" && \
|
| + test undefined != "$lt_cv_sys_max_cmd_len"; then
|
| lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
| lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
|
| else
|
| @@ -4932,7 +5083,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -4972,7 +5123,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_OBJDUMP="objdump"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5098,10 +5249,6 @@ freebsd* | dragonfly*)
|
| fi
|
| ;;
|
|
|
| -gnu*)
|
| - lt_cv_deplibs_check_method=pass_all
|
| - ;;
|
| -
|
| haiku*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
| @@ -5140,11 +5287,11 @@ irix5* | irix6* | nonstopux*)
|
| ;;
|
|
|
| # This must be glibc/ELF.
|
| -linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
| +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| -netbsd*)
|
| +netbsd* | netbsdelf*-gnu)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
| lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
| else
|
| @@ -5278,7 +5425,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5318,7 +5465,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_DLLTOOL="dlltool"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5422,7 +5569,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5466,7 +5613,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_AR="$ac_prog"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5591,7 +5738,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5631,7 +5778,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_STRIP="strip"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5690,7 +5837,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -5730,7 +5877,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_RANLIB="ranlib"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6222,7 +6369,7 @@ ia64-*-hpux*)
|
| rm -rf conftest*
|
| ;;
|
|
|
| -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
|
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| # Find out which ABI we are using.
|
| echo 'int i;' > conftest.$ac_ext
|
| @@ -6238,9 +6385,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| LD="${LD-ld} -m elf_i386_fbsd"
|
| ;;
|
| x86_64-*linux*)
|
| - LD="${LD-ld} -m elf_i386"
|
| + case `/usr/bin/file conftest.o` in
|
| + *x86-64*)
|
| + LD="${LD-ld} -m elf32_x86_64"
|
| + ;;
|
| + *)
|
| + LD="${LD-ld} -m elf_i386"
|
| + ;;
|
| + esac
|
| + ;;
|
| + powerpc64le-*)
|
| + LD="${LD-ld} -m elf32lppclinux"
|
| ;;
|
| - ppc64-*linux*|powerpc64-*linux*)
|
| + powerpc64-*)
|
| LD="${LD-ld} -m elf32ppclinux"
|
| ;;
|
| s390x-*linux*)
|
| @@ -6259,7 +6416,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| x86_64-*linux*)
|
| LD="${LD-ld} -m elf_x86_64"
|
| ;;
|
| - ppc*-*linux*|powerpc*-*linux*)
|
| + powerpcle-*)
|
| + LD="${LD-ld} -m elf64lppc"
|
| + ;;
|
| + powerpc-*)
|
| LD="${LD-ld} -m elf64ppc"
|
| ;;
|
| s390*-*linux*|s390*-*tpf*)
|
| @@ -6379,7 +6539,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6419,7 +6579,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6499,7 +6659,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6539,7 +6699,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6591,7 +6751,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6631,7 +6791,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_NMEDIT="nmedit"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6683,7 +6843,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6723,7 +6883,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_LIPO="lipo"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6775,7 +6935,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6815,7 +6975,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_OTOOL="otool"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6867,7 +7027,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -6907,7 +7067,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_ac_ct_OTOOL64="otool64"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -8067,7 +8227,7 @@ lt_prog_compiler_static=
|
| lt_prog_compiler_static='-non_shared'
|
| ;;
|
|
|
| - linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
| + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| case $cc_basename in
|
| # old Intel for x86_64 which still supported -KPIC.
|
| ecc*)
|
| @@ -8545,6 +8705,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| openbsd*)
|
| with_gnu_ld=no
|
| ;;
|
| + linux* | k*bsd*-gnu | gnu*)
|
| + link_all_deplibs=no
|
| + ;;
|
| esac
|
|
|
| ld_shlibs=yes
|
| @@ -8766,7 +8929,7 @@ _LT_EOF
|
| fi
|
| ;;
|
|
|
| - netbsd*)
|
| + netbsd* | netbsdelf*-gnu)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
| wlarc=
|
| @@ -8943,6 +9106,7 @@ _LT_EOF
|
| if test "$aix_use_runtimelinking" = yes; then
|
| shared_flag="$shared_flag "'${wl}-G'
|
| fi
|
| + link_all_deplibs=no
|
| else
|
| # not using gcc
|
| if test "$host_cpu" = ia64; then
|
| @@ -9396,7 +9560,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| link_all_deplibs=yes
|
| ;;
|
|
|
| - netbsd*)
|
| + netbsd* | netbsdelf*-gnu)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
| else
|
| @@ -10233,17 +10397,6 @@ freebsd* | dragonfly*)
|
| esac
|
| ;;
|
|
|
| -gnu*)
|
| - version_type=linux # correct to gnu/linux during the next big refactor
|
| - need_lib_prefix=no
|
| - need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - shlibpath_var=LD_LIBRARY_PATH
|
| - shlibpath_overrides_runpath=no
|
| - hardcode_into_libs=yes
|
| - ;;
|
| -
|
| haiku*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| @@ -10360,7 +10513,7 @@ linux*oldld* | linux*aout* | linux*coff*)
|
| ;;
|
|
|
| # This must be glibc/ELF.
|
| -linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
| +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| need_version=no
|
| @@ -10409,14 +10562,10 @@ fi
|
| # before this can be enabled.
|
| hardcode_into_libs=yes
|
|
|
| - # Add ABI-specific directories to the system library path.
|
| - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
| -
|
| # Append ld.so.conf contents to the search path
|
| if test -f /etc/ld.so.conf; then
|
| lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
| - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
| -
|
| + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
| fi
|
|
|
| # We used to test for /lib/ld.so.1 and disable shared libraries on
|
| @@ -10428,6 +10577,18 @@ fi
|
| dynamic_linker='GNU/Linux ld.so'
|
| ;;
|
|
|
| +netbsdelf*-gnu)
|
| + version_type=linux
|
| + need_lib_prefix=no
|
| + need_version=no
|
| + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
| + soname_spec='${libname}${release}${shared_ext}$major'
|
| + shlibpath_var=LD_LIBRARY_PATH
|
| + shlibpath_overrides_runpath=no
|
| + hardcode_into_libs=yes
|
| + dynamic_linker='NetBSD ld.elf_so'
|
| + ;;
|
| +
|
| netbsd*)
|
| version_type=sunos
|
| need_lib_prefix=no
|
| @@ -11398,131 +11559,6 @@ CC="$lt_save_CC"
|
| # Only expand once:
|
|
|
|
|
| -if test "x$CC" != xcc; then
|
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
|
| -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
|
| -else
|
| - { $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; }
|
| -fi
|
| -set dummy $CC; ac_cc=`$as_echo "$2" |
|
| - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
|
| -if eval \${ac_cv_prog_cc_${ac_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.
|
| -# We do the test twice because some compilers refuse to overwrite an
|
| -# existing .o file with -o, though they will create one.
|
| -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
|
| -rm -f conftest2.*
|
| -if { { case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
| -$as_echo "$ac_try_echo"; } >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - test $ac_status = 0; } &&
|
| - test -f conftest2.$ac_objext && { { case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
| -$as_echo "$ac_try_echo"; } >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - test $ac_status = 0; };
|
| -then
|
| - eval ac_cv_prog_cc_${ac_cc}_c_o=yes
|
| - if test "x$CC" != xcc; then
|
| - # Test first that cc exists at all.
|
| - if { ac_try='cc -c conftest.$ac_ext >&5'
|
| - { { case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
| -$as_echo "$ac_try_echo"; } >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - test $ac_status = 0; }; }; then
|
| - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
|
| - rm -f conftest2.*
|
| - if { { case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
| -$as_echo "$ac_try_echo"; } >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - test $ac_status = 0; } &&
|
| - test -f conftest2.$ac_objext && { { case "(($ac_try" in
|
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| - *) ac_try_echo=$ac_try;;
|
| -esac
|
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
| -$as_echo "$ac_try_echo"; } >&5
|
| - (eval "$ac_try") 2>&5
|
| - ac_status=$?
|
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - test $ac_status = 0; };
|
| - then
|
| - # cc works too.
|
| - :
|
| - else
|
| - # cc exists but doesn't like -o.
|
| - eval ac_cv_prog_cc_${ac_cc}_c_o=no
|
| - fi
|
| - fi
|
| - fi
|
| -else
|
| - eval ac_cv_prog_cc_${ac_cc}_c_o=no
|
| -fi
|
| -rm -f core conftest*
|
| -
|
| -fi
|
| -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
|
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| -$as_echo "yes" >&6; }
|
| -else
|
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| -$as_echo "no" >&6; }
|
| -
|
| -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
|
| -
|
| -fi
|
| -
|
| -# FIXME: we rely on the cache variable name because
|
| -# there is no other way.
|
| -set dummy $CC
|
| -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
|
| -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
|
| -if test "$am_t" != 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
|
| -
|
|
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
|
| @@ -11671,7 +11707,7 @@ main ()
|
| return 0;
|
| }
|
| _ACEOF
|
| -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
|
| +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
|
| do
|
| CC="$ac_save_CC $ac_arg"
|
| if ac_fn_c_try_compile "$LINENO"; then :
|
| @@ -11713,11 +11749,11 @@ else
|
| int
|
| main ()
|
| {
|
| -/* FIXME: Include the comments suggested by Paul. */
|
| +
|
| #ifndef __cplusplus
|
| - /* Ultrix mips cc rejects this. */
|
| + /* Ultrix mips cc rejects this sort of thing. */
|
| typedef int charset[2];
|
| - const charset cs;
|
| + const charset cs = { 0, 0 };
|
| /* SunOS 4.1.1 cc rejects this. */
|
| char const *const *pcpcc;
|
| char **ppc;
|
| @@ -11734,8 +11770,9 @@ main ()
|
| ++pcpcc;
|
| ppc = (char**) pcpcc;
|
| pcpcc = (char const *const *) ppc;
|
| - { /* SCO 3.2v4 cc rejects this. */
|
| - char *t;
|
| + { /* SCO 3.2v4 cc rejects this sort of thing. */
|
| + char tx;
|
| + char *t = &tx;
|
| char const *s = 0 ? (char *) 0 : (char const *) 0;
|
|
|
| *t++ = 0;
|
| @@ -11751,10 +11788,10 @@ main ()
|
| iptr p = 0;
|
| ++p;
|
| }
|
| - { /* AIX XL C 1.02.0.0 rejects this saying
|
| + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
|
| "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
|
| - struct s { int j; const int *ap[3]; };
|
| - struct s *b; b->j = 5;
|
| + struct s { int j; const int *ap[3]; } bx;
|
| + struct s *b = &bx; b->j = 5;
|
| }
|
| { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
|
| const int foo = 10;
|
| @@ -11843,8 +11880,8 @@ else
|
| # We make a subdir and do the tests there. Otherwise we can end up
|
| # making bogus files that we don't know about and never remove. For
|
| # instance it was reported that on HP-UX the gcc test will end up
|
| - # making a dummy file named `D' -- because `-MD' means `put the output
|
| - # in D'.
|
| + # making a dummy file named 'D' -- because '-MD' means "put the output
|
| + # in D".
|
| rm -rf conftest.dir
|
| mkdir conftest.dir
|
| # Copy depcomp to subdir because otherwise we won't find it if we're
|
| @@ -11877,16 +11914,16 @@ else
|
| : > sub/conftest.c
|
| for i in 1 2 3 4 5 6; do
|
| echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
| - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
| - # Solaris 8's {/usr,}/bin/sh.
|
| - touch sub/conftst$i.h
|
| + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
|
| + # Solaris 10 /bin/sh.
|
| + echo '/* dummy */' > sub/conftst$i.h
|
| done
|
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
|
|
| - # We check with `-c' and `-o' for the sake of the "dashmstdout"
|
| + # We check with '-c' and '-o' for the sake of the "dashmstdout"
|
| # mode. It turns out that the SunPro C++ compiler does not properly
|
| - # handle `-M -o', and we need to detect this. Also, some Intel
|
| - # versions had trouble with output in subdirs
|
| + # handle '-M -o', and we need to detect this. Also, some Intel
|
| + # versions had trouble with output in subdirs.
|
| am__obj=sub/conftest.${OBJEXT-o}
|
| am__minus_obj="-o $am__obj"
|
| case $depmode in
|
| @@ -11895,8 +11932,8 @@ else
|
| test "$am__universal" = false || continue
|
| ;;
|
| nosideeffect)
|
| - # after this tag, mechanisms are not by side-effect, so they'll
|
| - # only be used when explicitly requested
|
| + # After this tag, mechanisms are not by side-effect, so they'll
|
| + # only be used when explicitly requested.
|
| if test "x$enable_dependency_tracking" = xyes; then
|
| continue
|
| else
|
| @@ -11904,7 +11941,7 @@ else
|
| fi
|
| ;;
|
| msvc7 | msvc7msys | msvisualcpp | msvcmsys)
|
| - # This compiler won't grok `-c -o', but also, the minuso test has
|
| + # This compiler won't grok '-c -o', but also, the minuso test has
|
| # not run yet. These depmodes are late enough in the game, and
|
| # so weak that their functioning should not be impacted.
|
| am__obj=conftest.${OBJEXT-o}
|
| @@ -12363,12 +12400,20 @@ else
|
| fi
|
|
|
|
|
| +# Check whether --enable-intrinsics was given.
|
| +if test "${enable_intrinsics+set}" = set; then :
|
| + enableval=$enable_intrinsics;
|
| +else
|
| + enable_intrinsics=no
|
| +fi
|
| +
|
| +
|
| rtcd_support=no
|
| cpu_arm=no
|
|
|
| if test x"${enable_asm}" = x"yes"; then :
|
|
|
| - inline_optimization="No ASM for your platform, please send patches"
|
| + inline_optimization="No inline ASM for your platform, please send patches"
|
| case $host_cpu in
|
| arm*)
|
| if test "$enable_float" != "yes"; then :
|
| @@ -12549,7 +12594,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_HAVE_PERL="yes"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -12779,6 +12824,31 @@ else
|
| rtcd_support="no"
|
|
|
| fi
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apple style tools" >&5
|
| +$as_echo_n "checking for apple style tools... " >&6; }
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +
|
| +#ifndef __APPLE__
|
| +#error 1
|
| +#endif
|
| +int
|
| +main ()
|
| +{
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +if ac_fn_c_try_cpp "$LINENO"; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }; ARM2GNU_PARAMS="--apple"
|
| +else
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }; ARM2GNU_PARAMS=""
|
| +fi
|
| +rm -f conftest.err conftest.i conftest.$ac_ext
|
| +
|
|
|
| else
|
|
|
| @@ -12799,15 +12869,7 @@ else
|
|
|
| fi
|
|
|
| - if test "$cpu_arm" = "yes"; then
|
| - CPU_ARM_TRUE=
|
| - CPU_ARM_FALSE='#'
|
| -else
|
| - CPU_ARM_TRUE='#'
|
| - CPU_ARM_FALSE=
|
| -fi
|
| -
|
| - if test x"${inline_optimization:0:3}" = x"ARM"; then
|
| + if test x"${inline_optimization%% *}" = x"ARM"; then
|
| OPUS_ARM_INLINE_ASM_TRUE=
|
| OPUS_ARM_INLINE_ASM_FALSE='#'
|
| else
|
| @@ -12815,7 +12877,7 @@ else
|
| OPUS_ARM_INLINE_ASM_FALSE=
|
| fi
|
|
|
| - if test x"${asm_optimization:0:3}" = x"ARM"; then
|
| + if test x"${asm_optimization%% *}" = x"ARM"; then
|
| OPUS_ARM_EXTERNAL_ASM_TRUE=
|
| OPUS_ARM_EXTERNAL_ASM_FALSE='#'
|
| else
|
| @@ -12824,6 +12886,400 @@ else
|
| fi
|
|
|
|
|
| + if false; then
|
| + HAVE_SSE4_1_TRUE=
|
| + HAVE_SSE4_1_FALSE='#'
|
| +else
|
| + HAVE_SSE4_1_TRUE='#'
|
| + HAVE_SSE4_1_FALSE=
|
| +fi
|
| +
|
| + if false; then
|
| + HAVE_SSE2_TRUE=
|
| + HAVE_SSE2_FALSE='#'
|
| +else
|
| + HAVE_SSE2_TRUE='#'
|
| + HAVE_SSE2_FALSE=
|
| +fi
|
| +
|
| +
|
| +if test x"$enable_intrinsics" = x"yes"; then :
|
| +
|
| + case $host_cpu in
|
| + arm*)
|
| + cpu_arm=yes
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports ARM NEON intrinsics" >&5
|
| +$as_echo_n "checking if compiler supports ARM NEON intrinsics... " >&6; }
|
| + save_CFLAGS="$CFLAGS"; CFLAGS="-mfpu=neon $CFLAGS"
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +
|
| + #include <arm_neon.h>
|
| +
|
| +int
|
| +main ()
|
| +{
|
| +
|
| + static float32x4_t A[2], SUMM;
|
| + SUMM = vmlaq_f32(SUMM, A[0], A[1]);
|
| +
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| +
|
| +_ACEOF
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| +
|
| + OPUS_ARM_NEON_INTR=1
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| +
|
| +else
|
| +
|
| + OPUS_ARM_NEON_INTR=0
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| +$as_echo "no" >&6; }
|
| +
|
| +
|
| +fi
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| + CFLAGS="$save_CFLAGS"
|
| + #Now we know if compiler supports ARM neon intrinsics or not
|
| +
|
| + #Currently we only have intrinsic optimization for floating point
|
| + if test x"$enable_float" = x"yes"; then :
|
| +
|
| + if test x"$OPUS_ARM_NEON_INTR" = x"1"; then :
|
| +
|
| +
|
| +$as_echo "#define OPUS_ARM_NEON_INTR 1" >>confdefs.h
|
| +
|
| + if test x"enable_rtcd" != x""; then :
|
| + rtcd_support="ARM (ARMv7_Neon_Intrinsics)"
|
| +fi
|
| + enable_intrinsics="$enable_intrinsics ARMv7_Neon_Intrinsics"
|
| +
|
| +$as_echo "#define OPUS_ARM_MAY_HAVE_EDSP 1" >>confdefs.h
|
| +
|
| +
|
| +$as_echo "#define OPUS_ARM_MAY_HAVE_MEDIA 1" >>confdefs.h
|
| +
|
| +
|
| +$as_echo "#define OPUS_ARM_MAY_HAVE_NEON 1" >>confdefs.h
|
| +
|
| +
|
| +else
|
| +
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiler does not support ARM intrinsics" >&5
|
| +$as_echo "$as_me: WARNING: Compiler does not support ARM intrinsics" >&2;}
|
| + enable_intrinsics=no
|
| +
|
| +fi
|
| +
|
| +else
|
| +
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Currently on have ARM intrinsics for float" >&5
|
| +$as_echo "$as_me: WARNING: Currently on have ARM intrinsics for float" >&2;}
|
| + enable_intrinsics=no
|
| +
|
| +fi
|
| + ;;
|
| + "i386" | "i686" | "x86_64")
|
| + if test x"$enable_float" = x"no"; then :
|
| +
|
| + if test x"$enable_rtcd" = x"yes"; then :
|
| +
|
| + get_cpuid_by_asm="no"
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Get CPU Info" >&5
|
| +$as_echo_n "checking Get CPU Info... " >&6; }
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +
|
| + #include <stdio.h>
|
| +
|
| +int
|
| +main ()
|
| +{
|
| +
|
| + unsigned int CPUInfo0;
|
| + unsigned int CPUInfo1;
|
| + unsigned int CPUInfo2;
|
| + unsigned int CPUInfo3;
|
| + unsigned int InfoType;
|
| + __asm__ __volatile__ (
|
| + "cpuid11":
|
| + "=a" (CPUInfo0),
|
| + "=b" (CPUInfo1),
|
| + "=c" (CPUInfo2),
|
| + "=d" (CPUInfo3) :
|
| + "a" (InfoType), "c" (0)
|
| + );
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| + get_cpuid_by_asm="yes"
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Inline Assembly" >&5
|
| +$as_echo "Inline Assembly" >&6; }
|
| +else
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +
|
| + #include <cpuid.h>
|
| +
|
| +int
|
| +main ()
|
| +{
|
| +
|
| + unsigned int CPUInfo0;
|
| + unsigned int CPUInfo1;
|
| + unsigned int CPUInfo2;
|
| + unsigned int CPUInfo3;
|
| + unsigned int InfoType;
|
| + __get_cpuid(InfoType, &CPUInfo0, &CPUInfo1, &CPUInfo2, &CPUInfo3);
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C method" >&5
|
| +$as_echo "C method" >&6; }
|
| +else
|
| + as_fn_error $? "not support Get CPU Info, please disable intrinsics " "$LINENO" 5
|
| +fi
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| +fi
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| +
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking sse4.1" >&5
|
| +$as_echo_n "checking sse4.1... " >&6; }
|
| + TMP_CFLAGS="$CFLAGS"
|
| + gcc -Q --help=target | grep "\-msse4.1 "
|
| + if test x"$?" = x"0"; then :
|
| +
|
| + CFLAGS="$CFLAGS -msse4.1"
|
| + ac_fn_c_check_header_mongrel "$LINENO" "xmmintrin.h" "ac_cv_header_xmmintrin_h" "$ac_includes_default"
|
| +if test "x$ac_cv_header_xmmintrin_h" = xyes; then :
|
| +
|
| +else
|
| + as_fn_error $? "Couldn't find xmmintrin.h" "$LINENO" 5
|
| +fi
|
| +
|
| +
|
| + ac_fn_c_check_header_mongrel "$LINENO" "emmintrin.h" "ac_cv_header_emmintrin_h" "$ac_includes_default"
|
| +if test "x$ac_cv_header_emmintrin_h" = xyes; then :
|
| +
|
| +else
|
| + as_fn_error $? "Couldn't find emmintrin.h" "$LINENO" 5
|
| +fi
|
| +
|
| +
|
| + ac_fn_c_check_header_compile "$LINENO" "smmintrin.h" "ac_cv_header_smmintrin_h" "
|
| + #ifdef HAVE_XMMINSTRIN_H
|
| + #include <xmmintrin.h>
|
| + #endif
|
| + #ifdef HAVE_EMMINSTRIN_H
|
| + #include <emmintrin.h>
|
| + #endif
|
| +
|
| +"
|
| +if test "x$ac_cv_header_smmintrin_h" = xyes; then :
|
| +
|
| +else
|
| + as_fn_error $? "Couldn't find smmintrin.h" "$LINENO" 5
|
| +fi
|
| +
|
| +
|
| +
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +
|
| + #include <xmmintrin.h>
|
| + #include <emmintrin.h>
|
| + #include <smmintrin.h>
|
| +
|
| +int
|
| +main ()
|
| +{
|
| +
|
| + __m128i mtest = _mm_setzero_si128();
|
| + mtest = _mm_cmpeq_epi64(mtest, mtest);
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| +else
|
| + as_fn_error $? "Compiler & linker failure for sse4.1, please disable intrinsics" "$LINENO" 5
|
| +fi
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| +
|
| + CFLAGS="$TMP_CFLAGS"
|
| +
|
| +$as_echo "#define OPUS_X86_MAY_HAVE_SSE4_1 1" >>confdefs.h
|
| +
|
| +
|
| +$as_echo "#define OPUS_X86_MAY_HAVE_SSE2 1" >>confdefs.h
|
| +
|
| + rtcd_support="x86 sse4.1"
|
| + if true; then
|
| + HAVE_SSE4_1_TRUE=
|
| + HAVE_SSE4_1_FALSE='#'
|
| +else
|
| + HAVE_SSE4_1_TRUE='#'
|
| + HAVE_SSE4_1_FALSE=
|
| +fi
|
| +
|
| + if true; then
|
| + HAVE_SSE2_TRUE=
|
| + HAVE_SSE2_FALSE='#'
|
| +else
|
| + HAVE_SSE2_TRUE='#'
|
| + HAVE_SSE2_FALSE=
|
| +fi
|
| +
|
| + if test x"$get_cpuid_by_asm" = x"yes"; then :
|
| +
|
| +$as_echo "#define CPU_INFO_BY_ASM 1" >>confdefs.h
|
| +
|
| +else
|
| +
|
| +$as_echo "#define CPU_INFO_BY_C 1" >>confdefs.h
|
| +
|
| +fi
|
| +
|
| +else
|
| + ##### Else case for AS_IF([test x"$?" = x"0"])
|
| + gcc -Q --help=target | grep "\-msse2 "
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking sse2" >&5
|
| +$as_echo_n "checking sse2... " >&6; }
|
| + if test x"$?" = x"0"; then :
|
| +
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| + CFLAGS="$CFLAGS -msse2"
|
| + ac_fn_c_check_header_mongrel "$LINENO" "xmmintrin.h" "ac_cv_header_xmmintrin_h" "$ac_includes_default"
|
| +if test "x$ac_cv_header_xmmintrin_h" = xyes; then :
|
| +
|
| +else
|
| + as_fn_error $? "Couldn't find xmmintrin.h" "$LINENO" 5
|
| +fi
|
| +
|
| +
|
| + ac_fn_c_check_header_mongrel "$LINENO" "emmintrin.h" "ac_cv_header_emmintrin_h" "$ac_includes_default"
|
| +if test "x$ac_cv_header_emmintrin_h" = xyes; then :
|
| +
|
| +else
|
| + as_fn_error $? "Couldn't find emmintrin.h" "$LINENO" 5
|
| +fi
|
| +
|
| +
|
| +
|
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| +/* end confdefs.h. */
|
| +
|
| + #include <xmmintrin.h>
|
| + #include <emmintrin.h>
|
| +
|
| +int
|
| +main ()
|
| +{
|
| +
|
| + __m128i mtest = _mm_setzero_si128();
|
| +
|
| + ;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +if ac_fn_c_try_link "$LINENO"; then :
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| +$as_echo "yes" >&6; }
|
| +else
|
| + as_fn_error $? "Compiler & linker failure for sse2, please disable intrinsics" "$LINENO" 5
|
| +fi
|
| +rm -f core conftest.err conftest.$ac_objext \
|
| + conftest$ac_exeext conftest.$ac_ext
|
| +
|
| + CFLAGS="$TMP_CFLAGS"
|
| +
|
| +$as_echo "#define OPUS_X86_MAY_HAVE_SSE2 1" >>confdefs.h
|
| +
|
| + rtcd_support="x86 sse2"
|
| + if true; then
|
| + HAVE_SSE2_TRUE=
|
| + HAVE_SSE2_FALSE='#'
|
| +else
|
| + HAVE_SSE2_TRUE='#'
|
| + HAVE_SSE2_FALSE=
|
| +fi
|
| +
|
| + if test x"$get_cpuid_by_asm" = x"yes"; then :
|
| +
|
| +$as_echo "#define CPU_INFO_BY_ASM 1" >>confdefs.h
|
| +
|
| +else
|
| +
|
| +$as_echo "#define CPU_INFO_BY_C 1" >>confdefs.h
|
| +
|
| +fi
|
| +
|
| +else
|
| + enable_intrinsics="no"
|
| +fi #End of AS_IF([test x"$?" = x"0"]
|
| +
|
| +fi
|
| +
|
| +else
|
| +
|
| + enable_intrinsics="no"
|
| +
|
| +fi ## End of AS_IF([test x"$enable_rtcd" = x"yes"]
|
| +
|
| +else
|
| + ## Else case for AS_IF([test x"$enable_float" = x"no"]
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling intrinsics .. x86 intrinsics only avail for fixed point" >&5
|
| +$as_echo "$as_me: WARNING: Disabling intrinsics .. x86 intrinsics only avail for fixed point" >&2;}
|
| + enable_intrinsics="no"
|
| +
|
| +fi ## End of AS_IF([test x"$enable_float" = x"no"]
|
| + ;;
|
| + *)
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No intrinsics support for your architecture" >&5
|
| +$as_echo "$as_me: WARNING: No intrinsics support for your architecture" >&2;}
|
| + enable_intrinsics="no"
|
| + ;;
|
| + esac
|
| +
|
| +fi
|
| +
|
| + if test "$cpu_arm" = "yes"; then
|
| + CPU_ARM_TRUE=
|
| + CPU_ARM_FALSE='#'
|
| +else
|
| + CPU_ARM_TRUE='#'
|
| + CPU_ARM_FALSE=
|
| +fi
|
| +
|
| + if test x"$OPUS_ARM_NEON_INTR" = x"1"; then
|
| + OPUS_ARM_NEON_INTR_TRUE=
|
| + OPUS_ARM_NEON_INTR_FALSE='#'
|
| +else
|
| + OPUS_ARM_NEON_INTR_TRUE='#'
|
| + OPUS_ARM_NEON_INTR_FALSE=
|
| +fi
|
| +
|
| +
|
| if test x"$enable_rtcd" = x"yes"; then :
|
|
|
| if test x"$rtcd_support" != x"no"; then :
|
| @@ -12900,7 +13356,7 @@ do
|
| IFS=$as_save_IFS
|
| test -z "$as_dir" && as_dir=.
|
| for ac_exec_ext in '' $ac_executable_extensions; do
|
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
| + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
| ac_cv_prog_HAVE_DOXYGEN="yes"
|
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
| break 2
|
| @@ -13151,6 +13607,14 @@ LIBOBJS=$ac_libobjs
|
| LTLIBOBJS=$ac_ltlibobjs
|
|
|
|
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
|
| +$as_echo_n "checking that generated files are newer than configure... " >&6; }
|
| + if test -n "$am_sleep_pid"; then
|
| + # Hide warnings about reused PIDs.
|
| + wait $am_sleep_pid 2>/dev/null
|
| + fi
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
|
| +$as_echo "done" >&6; }
|
| if test -n "$EXEEXT"; then
|
| am__EXEEXT_TRUE=
|
| am__EXEEXT_FALSE='#'
|
| @@ -13195,10 +13659,6 @@ if test -z "${OPUS_ARM_EXTERNAL_ASM_TRUE}" && test -z "${OPUS_ARM_EXTERNAL_ASM_F
|
| as_fn_error $? "conditional \"OPUS_ARM_EXTERNAL_ASM\" was never defined.
|
| Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| -if test -z "${CPU_ARM_TRUE}" && test -z "${CPU_ARM_FALSE}"; then
|
| - as_fn_error $? "conditional \"CPU_ARM\" was never defined.
|
| -Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| -fi
|
| if test -z "${OPUS_ARM_INLINE_ASM_TRUE}" && test -z "${OPUS_ARM_INLINE_ASM_FALSE}"; then
|
| as_fn_error $? "conditional \"OPUS_ARM_INLINE_ASM\" was never defined.
|
| Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| @@ -13207,6 +13667,34 @@ if test -z "${OPUS_ARM_EXTERNAL_ASM_TRUE}" && test -z "${OPUS_ARM_EXTERNAL_ASM_F
|
| as_fn_error $? "conditional \"OPUS_ARM_EXTERNAL_ASM\" was never defined.
|
| Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| fi
|
| +if test -z "${HAVE_SSE4_1_TRUE}" && test -z "${HAVE_SSE4_1_FALSE}"; then
|
| + as_fn_error $? "conditional \"HAVE_SSE4_1\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| +if test -z "${HAVE_SSE2_TRUE}" && test -z "${HAVE_SSE2_FALSE}"; then
|
| + as_fn_error $? "conditional \"HAVE_SSE2\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| +if test -z "${HAVE_SSE4_1_TRUE}" && test -z "${HAVE_SSE4_1_FALSE}"; then
|
| + as_fn_error $? "conditional \"HAVE_SSE4_1\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| +if test -z "${HAVE_SSE2_TRUE}" && test -z "${HAVE_SSE2_FALSE}"; then
|
| + as_fn_error $? "conditional \"HAVE_SSE2\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| +if test -z "${HAVE_SSE2_TRUE}" && test -z "${HAVE_SSE2_FALSE}"; then
|
| + as_fn_error $? "conditional \"HAVE_SSE2\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| +if test -z "${CPU_ARM_TRUE}" && test -z "${CPU_ARM_FALSE}"; then
|
| + as_fn_error $? "conditional \"CPU_ARM\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| +if test -z "${OPUS_ARM_NEON_INTR_TRUE}" && test -z "${OPUS_ARM_NEON_INTR_FALSE}"; then
|
| + as_fn_error $? "conditional \"OPUS_ARM_NEON_INTR\" was never defined.
|
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| +fi
|
| if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
|
| as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
|
| Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
| @@ -13513,16 +14001,16 @@ if (echo >conf$$.file) 2>/dev/null; then
|
| # ... but there are two gotchas:
|
| # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
| # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
| - # In both cases, we have to default to `cp -p'.
|
| + # In both cases, we have to default to `cp -pR'.
|
| ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
| - as_ln_s='cp -p'
|
| + as_ln_s='cp -pR'
|
| elif ln conf$$.file conf$$ 2>/dev/null; then
|
| as_ln_s=ln
|
| else
|
| - as_ln_s='cp -p'
|
| + as_ln_s='cp -pR'
|
| fi
|
| else
|
| - as_ln_s='cp -p'
|
| + as_ln_s='cp -pR'
|
| fi
|
| rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
| rmdir conf$$.dir 2>/dev/null
|
| @@ -13582,28 +14070,16 @@ else
|
| as_mkdir_p=false
|
| fi
|
|
|
| -if test -x / >/dev/null 2>&1; then
|
| - as_test_x='test -x'
|
| -else
|
| - if ls -dL / >/dev/null 2>&1; then
|
| - as_ls_L_option=L
|
| - else
|
| - as_ls_L_option=
|
| - fi
|
| - as_test_x='
|
| - eval sh -c '\''
|
| - if test -d "$1"; then
|
| - test -d "$1/.";
|
| - else
|
| - case $1 in #(
|
| - -*)set "./$1";;
|
| - esac;
|
| - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
| - ???[sx]*):;;*)false;;esac;fi
|
| - '\'' sh
|
| - '
|
| -fi
|
| -as_executable_p=$as_test_x
|
| +
|
| +# as_fn_executable_p FILE
|
| +# -----------------------
|
| +# Test if FILE is an executable regular file.
|
| +as_fn_executable_p ()
|
| +{
|
| + test -f "$1" && test -x "$1"
|
| +} # as_fn_executable_p
|
| +as_test_x='test -x'
|
| +as_executable_p=as_fn_executable_p
|
|
|
| # Sed expression to map a string onto a valid CPP name.
|
| as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
| @@ -13624,8 +14100,8 @@ 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 opus $as_me 1.1, which was
|
| -generated by GNU Autoconf 2.68. Invocation command line was
|
| +This file was extended by opus $as_me 1.1.1-beta-24-g66611f1, which was
|
| +generated by GNU Autoconf 2.69. Invocation command line was
|
|
|
| CONFIG_FILES = $CONFIG_FILES
|
| CONFIG_HEADERS = $CONFIG_HEADERS
|
| @@ -13690,11 +14166,11 @@ _ACEOF
|
| cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
| ac_cs_version="\\
|
| -opus config.status 1.1
|
| -configured by $0, generated by GNU Autoconf 2.68,
|
| +opus config.status 1.1.1-beta-24-g66611f1
|
| +configured by $0, generated by GNU Autoconf 2.69,
|
| with options \\"\$ac_cs_config\\"
|
|
|
| -Copyright (C) 2010 Free Software Foundation, Inc.
|
| +Copyright (C) 2012 Free Software Foundation, Inc.
|
| This config.status script is free software; the Free Software Foundation
|
| gives unlimited permission to copy, distribute and modify it."
|
|
|
| @@ -13785,7 +14261,7 @@ fi
|
| _ACEOF
|
| cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| if \$ac_cs_recheck; then
|
| - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
| + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
| shift
|
| \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
| CONFIG_SHELL='$SHELL'
|
| @@ -14701,7 +15177,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
|
|
| case $ac_file$ac_mode in
|
| "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
|
| - # Autoconf 2.62 quotes --file arguments for eval, but not when files
|
| + # Older Autoconf quotes --file arguments for eval, but not when files
|
| # are listed without --file. Let's play safe and only enable the eval
|
| # if we detect the quoting.
|
| case $CONFIG_FILES in
|
| @@ -14714,7 +15190,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
| # Strip MF so we end up with the name of the file.
|
| mf=`echo "$mf" | sed -e 's/:.*$//'`
|
| # Check whether this is an Automake generated Makefile or not.
|
| - # We used to match only the files named `Makefile.in', but
|
| + # We used to match only the files named 'Makefile.in', but
|
| # some people rename them; so instead we look at the file content.
|
| # Grep'ing the first line is not enough: some people post-process
|
| # each Makefile.in and add a new line on top of each file to say so.
|
| @@ -14748,21 +15224,19 @@ $as_echo X"$mf" |
|
| continue
|
| fi
|
| # Extract the definition of DEPDIR, am__include, and am__quote
|
| - # from the Makefile without running `make'.
|
| + # from the Makefile without running 'make'.
|
| 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"`
|
| - # When using ansi2knr, U may be empty or an underscore; expand it
|
| - U=`sed -n 's/^U = //p' < "$mf"`
|
| # Find all dependency output files, they are included files with
|
| # $(DEPDIR) in their names. We invoke sed twice because it is the
|
| # simplest approach to changing $(DEPDIR) to its actual value in the
|
| # expansion.
|
| for file in `sed -n "
|
| s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
| - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
| + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
|
| # Make sure the directory exists.
|
| test -f "$dirpart/$file" && continue
|
| fdir=`$as_dirname -- "$file" ||
|
| @@ -15481,6 +15955,7 @@ fi
|
| Fixed point debugging: ......... ${enable_fixed_point_debug}
|
| Inline Assembly Optimizations: . ${inline_optimization}
|
| External Assembly Optimizations: ${asm_optimization}
|
| + Intrinsics Optimizations.......: ${enable_intrinsics}
|
| Run-time CPU detection: ........ ${rtcd_support}
|
| Custom modes: .................. ${enable_custom_modes}
|
| Assertion checking: ............ ${enable_assertions}
|
| @@ -15510,6 +15985,7 @@ $as_echo "$as_me:
|
| Fixed point debugging: ......... ${enable_fixed_point_debug}
|
| Inline Assembly Optimizations: . ${inline_optimization}
|
| External Assembly Optimizations: ${asm_optimization}
|
| + Intrinsics Optimizations.......: ${enable_intrinsics}
|
| Run-time CPU detection: ........ ${rtcd_support}
|
| Custom modes: .................. ${enable_custom_modes}
|
| Assertion checking: ............ ${enable_assertions}
|
|
|
Chromium Code Reviews
Issue 882843002:
Update to opus-HEAD-66611f1. (Closed)
Base URL: https://chromium.googlesource.com/chromium/deps/opus.git@master