Bump version to 0.11.2
[opus.git] / configure.ac
index aa2e4c9..3be0a7d 100644 (file)
@@ -5,18 +5,20 @@ AC_INIT(libcelt/arch.h)
 AM_CONFIG_HEADER([config.h])
 
 CELT_MAJOR_VERSION=0
-CELT_MINOR_VERSION=5
+CELT_MINOR_VERSION=11
 CELT_MICRO_VERSION=2
 CELT_EXTRA_VERSION=
 CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
+LIBCELT_SUFFIX=0
 
-CELT_LT_CURRENT=0
+CELT_LT_CURRENT=2
 CELT_LT_REVISION=0
 CELT_LT_AGE=0
 
 AC_SUBST(CELT_LT_CURRENT)
 AC_SUBST(CELT_LT_REVISION)
 AC_SUBST(CELT_LT_AGE)
+AC_SUBST(LIBCELT_SUFFIX)
 
 # For automake.
 VERSION=$CELT_VERSION
@@ -91,36 +93,65 @@ AC_DEFINE_UNQUOTED(CELT_MINOR_VERSION, ${CELT_MINOR_VERSION}, [Version minor])
 AC_DEFINE_UNQUOTED(CELT_MICRO_VERSION, ${CELT_MICRO_VERSION}, [Version micro])
 AC_DEFINE_UNQUOTED(CELT_EXTRA_VERSION, "${CELT_EXTRA_VERSION}", [Version extra])
 
-AC_ARG_ENABLE(fixed-point, [  --enable-fixed-point    Compile as fixed-point],
+has_float_approx=no
+#case "$host_cpu" in
+#i[[3456]]86 | x86_64 | powerpc64 | powerpc32 | ia64)
+#  has_float_approx=yes
+#  ;;
+#esac    
+
+ac_enable_fixed="no";
+AC_ARG_ENABLE(fixed-point, [  --enable-fixed-point    compile as fixed-point],
 [if test "$enableval" = yes; then
+  ac_enable_fixed="yes";
   AC_DEFINE([FIXED_POINT], , [Compile as fixed-point])
-  AC_DEFINE([DOUBLE_PRECISION], , [Compile as fixed-point])
-  AC_DEFINE([MIXED_PRECISION], , [Compile as fixed-point])
 else
   AC_DEFINE([FLOATING_POINT], , [Compile as floating-point])
 fi],
 AC_DEFINE([FLOATING_POINT], , [Compile as floating-point]))
 
-AC_ARG_ENABLE(fixed-point-debug, [  --enable-fixed-point-debug  Debug fixed-point implementation],
+ac_enable_fixed_debug="no"
+AC_ARG_ENABLE(fixed-point-debug, [  --enable-fixed-point-debug  debug fixed-point implementation],
 [if test "$enableval" = yes; then
+  ac_enable_fixed_debug="yes"
   AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])
 fi])
 
-AC_ARG_ENABLE(static-modes, [  --enable-static-modes],
+ac_enable_experimental_postfilter="no"
+AC_ARG_ENABLE(experimental-postfilter, [  --enable-experimental-postfilter     Enable this for testing only if you know what you're doing ],
 [if test "$enableval" = yes; then
-  AC_DEFINE([STATIC_MODES], , [Static modes])
+  ac_enable_experimental_postfilter="yes"
+  AC_DEFINE([ENABLE_POSTFILTER], , [Postfilter])
 fi])
 
-AC_ARG_ENABLE(assertions, [  --enable-assertions],
+ac_enable_custom_modes="no"
+AC_ARG_ENABLE(custom-modes, [  --enable-custom-modes        Enable non-Opus modes, like 44.1 kHz and powers of two ],
 [if test "$enableval" = yes; then
-  AC_DEFINE([ENABLE_ASSERTIONS], , [Assertions])
+  ac_enable_custom_modes="yes"
+  AC_DEFINE([CUSTOM_MODES], , [Custom modes])
 fi])
 
-AC_ARG_ENABLE(new-plc, [  --enable-new-plc],
+float_approx=$has_float_approx
+AC_ARG_ENABLE(float-approx, [  --enable-float-approx   enable fast approximations for floating point],
+    [ if test "$enableval" = yes; then
+    AC_WARN([Floating point approximations are not supported on all platforms.])
+    float_approx=yes
+    else
+    float_approx=no
+    fi], [ float_approx=$has_float_approx ])
+
+if test "x${float_approx}" = "xyes"; then
+    AC_DEFINE([FLOAT_APPROX], , [Float approximations])
+fi
+
+ac_enable_assertions="no"
+AC_ARG_ENABLE(assertions, [  --enable-assertions     enable additional software error checking],
 [if test "$enableval" = yes; then
-  AC_DEFINE([NEW_PLC], , [Use new PLC code])
+  ac_enable_assertions="yes"
+  AC_DEFINE([ENABLE_ASSERTIONS], , [Assertions])
 fi])
 
+if test "$OPUS_BUILD" != "true" ; then
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fvisibility=hidden"
 AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden])
@@ -130,13 +161,14 @@ AC_COMPILE_IFELSE([char foo;],
         AC_MSG_RESULT([no]))
 CFLAGS="$saved_CFLAGS $SYMBOL_VISIBILITY"
 AC_SUBST(SYMBOL_VISIBILITY)
+fi
 
 if test $ac_cv_c_compiler_gnu = yes ; then
         CFLAGS="$CFLAGS -W -Wstrict-prototypes -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wno-parentheses -Wno-unused-parameter -Wno-sign-compare"
 fi
 
-AC_C99_FUNC_LRINTF
-AC_C99_FUNC_LRINT
+AC_CHECK_FUNCS([lrintf])
+AC_CHECK_FUNCS([lrint])
 
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
@@ -172,9 +204,33 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
+if test "$OPUS_BUILD" = "true" ; then
+AC_DEFINE(OPUS_BUILD, [], [We're part of Opus])
+fi
+
 AC_OUTPUT([Makefile libcelt/Makefile tests/Makefile 
            celt.pc tools/Makefile libcelt.spec ])
 
+AC_MSG_RESULT([
+------------------------------------------------------------------------
+  $PACKAGE $VERSION:  Automatic configuration OK.
+  
+    Compiler support:
+
+      C99 var arrays: ................ ${has_var_arrays}
+      C99 lrintf: .................... ${ac_cv_func_lrintf}
+      Alloca: ........................ ${has_alloca}
+    
+    General configuration:
+    
+      Fast float approximations: ..... ${float_approx}
+      Fixed point support: ........... ${ac_enable_fixed}
+      Fixed point debugging: ......... ${ac_enable_fixed_debug}
+      Custom modes: .................. ${ac_enable_custom_modes}
+      Assertion checking: ............ ${ac_enable_assertions}
+------------------------------------------------------------------------
+])
+
 if test "x$tools" = "x"; then 
 echo "**IMPORTANT**"
 echo "You don't seem to have the development package for libogg (libogg-devel) available. Only the library will be built (no encoder/decoder executable)"
@@ -182,3 +238,4 @@ echo "You can download libogg from http://www.vorbis.com/download.psp"
 fi
 
 echo "Type \"make; make install\" to compile and install";
+echo "Type \"make check\" to run the test suite";