| Index: configure
|
| diff --git a/configure b/configure
|
| index bcb9c7ac792fe1a1efcab48a70d0bf77dc1d2d02..00405baf48b3786d6bdca5bf56bc5e35bbf1dd65 100755
|
| --- a/configure
|
| +++ b/configure
|
| @@ -613,6 +613,8 @@ ac_subst_vars='am__EXEEXT_FALSE
|
| am__EXEEXT_TRUE
|
| LTLIBOBJS
|
| LIBOBJS
|
| +PC_LIBM
|
| +PC_BUILD
|
| CUSTOM_MODES_FALSE
|
| CUSTOM_MODES_TRUE
|
| FIXED_POINT_FALSE
|
| @@ -1393,7 +1395,7 @@ Optional Features:
|
| --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')
|
| - --enable-maintainer-mode enable make rules and dependencies not useful
|
| + --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]
|
| @@ -2484,9 +2486,9 @@ _ACEOF
|
|
|
|
|
| # For libtool.
|
| -OPUS_LT_CURRENT=2
|
| +OPUS_LT_CURRENT=3
|
| OPUS_LT_REVISION=0
|
| -OPUS_LT_AGE=2
|
| +OPUS_LT_AGE=3
|
|
|
|
|
|
|
| @@ -2997,7 +2999,7 @@ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles
|
| if test "${enable_maintainer_mode+set}" = set; then :
|
| enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
|
| else
|
| - USE_MAINTAINER_MODE=no
|
| + USE_MAINTAINER_MODE=yes
|
| fi
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
|
| @@ -11887,230 +11889,6 @@ if test "x$ac_cv_prog_cc_c99" != xno; then :
|
| fi
|
|
|
|
|
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
|
| -$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
|
| -if ${ac_cv_c_bigendian+:} false; then :
|
| - $as_echo_n "(cached) " >&6
|
| -else
|
| - ac_cv_c_bigendian=unknown
|
| - # See if we're dealing with a universal compiler.
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -#ifndef __APPLE_CC__
|
| - not a universal capable compiler
|
| - #endif
|
| - typedef int dummy;
|
| -
|
| -_ACEOF
|
| -if ac_fn_c_try_compile "$LINENO"; then :
|
| -
|
| - # Check for potential -arch flags. It is not universal unless
|
| - # there are at least two -arch flags with different values.
|
| - ac_arch=
|
| - ac_prev=
|
| - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
|
| - if test -n "$ac_prev"; then
|
| - case $ac_word in
|
| - i?86 | x86_64 | ppc | ppc64)
|
| - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
|
| - ac_arch=$ac_word
|
| - else
|
| - ac_cv_c_bigendian=universal
|
| - break
|
| - fi
|
| - ;;
|
| - esac
|
| - ac_prev=
|
| - elif test "x$ac_word" = "x-arch"; then
|
| - ac_prev=arch
|
| - fi
|
| - done
|
| -fi
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - if test $ac_cv_c_bigendian = unknown; then
|
| - # See if sys/param.h defines the BYTE_ORDER macro.
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -#include <sys/types.h>
|
| - #include <sys/param.h>
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
|
| - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
|
| - && LITTLE_ENDIAN)
|
| - bogus endian macros
|
| - #endif
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -if ac_fn_c_try_compile "$LINENO"; then :
|
| - # It does; now see whether it defined to BIG_ENDIAN or not.
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -#include <sys/types.h>
|
| - #include <sys/param.h>
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -#if BYTE_ORDER != BIG_ENDIAN
|
| - not big endian
|
| - #endif
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -if ac_fn_c_try_compile "$LINENO"; then :
|
| - ac_cv_c_bigendian=yes
|
| -else
|
| - ac_cv_c_bigendian=no
|
| -fi
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - fi
|
| - if test $ac_cv_c_bigendian = unknown; then
|
| - # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -#include <limits.h>
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
|
| - bogus endian macros
|
| - #endif
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -if ac_fn_c_try_compile "$LINENO"; then :
|
| - # It does; now see whether it defined to _BIG_ENDIAN or not.
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -#include <limits.h>
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -#ifndef _BIG_ENDIAN
|
| - not big endian
|
| - #endif
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -if ac_fn_c_try_compile "$LINENO"; then :
|
| - ac_cv_c_bigendian=yes
|
| -else
|
| - ac_cv_c_bigendian=no
|
| -fi
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -fi
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| - fi
|
| - if test $ac_cv_c_bigendian = unknown; then
|
| - # Compile a test program.
|
| - if test "$cross_compiling" = yes; then :
|
| - # Try to guess by grepping values from an object file.
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -short int ascii_mm[] =
|
| - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
|
| - short int ascii_ii[] =
|
| - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
|
| - int use_ascii (int i) {
|
| - return ascii_mm[i] + ascii_ii[i];
|
| - }
|
| - short int ebcdic_ii[] =
|
| - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
|
| - short int ebcdic_mm[] =
|
| - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
|
| - int use_ebcdic (int i) {
|
| - return ebcdic_mm[i] + ebcdic_ii[i];
|
| - }
|
| - extern int foo;
|
| -
|
| -int
|
| -main ()
|
| -{
|
| -return use_ascii (foo) == use_ebcdic (foo);
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -if ac_fn_c_try_compile "$LINENO"; then :
|
| - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
|
| - ac_cv_c_bigendian=yes
|
| - fi
|
| - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
|
| - if test "$ac_cv_c_bigendian" = unknown; then
|
| - ac_cv_c_bigendian=no
|
| - else
|
| - # finding both strings is unlikely to happen, but who knows?
|
| - ac_cv_c_bigendian=unknown
|
| - fi
|
| - fi
|
| -fi
|
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
| -else
|
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| -/* end confdefs.h. */
|
| -$ac_includes_default
|
| -int
|
| -main ()
|
| -{
|
| -
|
| - /* Are we little or big endian? From Harbison&Steele. */
|
| - union
|
| - {
|
| - long int l;
|
| - char c[sizeof (long int)];
|
| - } u;
|
| - u.l = 1;
|
| - return u.c[sizeof (long int) - 1] == 1;
|
| -
|
| - ;
|
| - return 0;
|
| -}
|
| -_ACEOF
|
| -if ac_fn_c_try_run "$LINENO"; then :
|
| - ac_cv_c_bigendian=no
|
| -else
|
| - ac_cv_c_bigendian=yes
|
| -fi
|
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
| - conftest.$ac_objext conftest.beam conftest.$ac_ext
|
| -fi
|
| -
|
| - fi
|
| -fi
|
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
|
| -$as_echo "$ac_cv_c_bigendian" >&6; }
|
| - case $ac_cv_c_bigendian in #(
|
| - yes)
|
| - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
|
| -;; #(
|
| - no)
|
| - ;; #(
|
| - universal)
|
| -
|
| -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
|
| -
|
| - ;; #(
|
| - *)
|
| - as_fn_error $? "unknown endianness
|
| - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
|
| - esac
|
| -
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
| $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
| if ${ac_cv_c_const+:} false; then :
|
| @@ -12428,15 +12206,7 @@ if test "${enable_fixed_point+set}" = set; then :
|
|
|
| $as_echo "#define FIXED_POINT 1" >>confdefs.h
|
|
|
| -else
|
| -
|
| -$as_echo "#define FLOATING_POINT /**/" >>confdefs.h
|
| -
|
| fi
|
| -else
|
| -
|
| -$as_echo "#define FLOATING_POINT /**/" >>confdefs.h
|
| -
|
| fi
|
|
|
|
|
| @@ -12820,8 +12590,24 @@ else
|
| fi
|
|
|
|
|
| +if test x$ac_enable_float = xyes; then
|
| + PC_BUILD="floating-point"
|
| + PC_LIBM=$LIBM
|
| +else
|
| + PC_BUILD="fixed-point"
|
| + PC_LIBM=
|
| +fi
|
| +if test x$ac_enable_custom_modes = xyes; then
|
| + PC_BUILD="${PC_BUILD}, custom modes"
|
| + PC_LIBM=$LIBM
|
| +fi
|
| +
|
| +
|
| +
|
| +
|
| ac_config_files="$ac_config_files Makefile opus.pc opus-uninstalled.pc doc/Makefile doc/Doxyfile"
|
|
|
| +
|
| cat >confcache <<\_ACEOF
|
| # This file is a shell script that caches the results of configure
|
| # tests run on this system so they can be shared between configure
|
| @@ -12951,7 +12737,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
|
| as_fn_error $? "conditional \"am__fastdepCC\" 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
|
|
|