Fixes some issues in the MF range coder on systems were ints are 16 bits.

[opus.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3f21bba..2ab7876 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ AC_INIT(libcelt/arch.h)
 AM_CONFIG_HEADER([config.h])
 
 CELT_MAJOR_VERSION=0
-CELT_MINOR_VERSION=0
-CELT_MICRO_VERSION=2
+CELT_MINOR_VERSION=5
+CELT_MICRO_VERSION=0
 CELT_EXTRA_VERSION=
 CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
 
@@ -35,6 +35,7 @@ AC_C_CONST
 AC_C_INLINE
 AC_C_RESTRICT
 
+AC_DEFINE([CELT_BUILD], [], [This is a build of CELT])
 
 AC_MSG_CHECKING(for C99 variable-size arrays)
 AC_TRY_COMPILE( , [
@@ -47,6 +48,7 @@ has_var_arrays=no
 )
 AC_MSG_RESULT($has_var_arrays)
 
+AC_CHECK_HEADERS([alloca.h getopt.h])
 AC_MSG_CHECKING(for alloca)
 AC_TRY_COMPILE( [#include <alloca.h>], [
 int foo=10;
@@ -62,11 +64,10 @@ has_alloca=no
 )
 AC_MSG_RESULT($has_alloca)
 
-
 AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
 
-XIPH_PATH_OGG([src="src"], [src=""])
-AC_SUBST(src)
+XIPH_PATH_OGG([tools="tools"], [tools=""])
+AC_SUBST(tools)
 
 AC_CHECK_LIB(m, sin)
 
@@ -87,6 +88,39 @@ 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],
+[if test "$enableval" = yes; then
+  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],
+[if test "$enableval" = yes; then
+  AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])
+fi])
+
+AC_ARG_ENABLE(static-modes, [  --enable-static-modes],
+[if test "$enableval" = yes; then
+  AC_DEFINE([STATIC_MODES], , [Static modes])
+fi])
+
+AC_ARG_ENABLE(assertions, [  --enable-assertions],
+[if test "$enableval" = yes; then
+  AC_DEFINE([ENABLE_ASSERTIONS], , [Assertions])
+fi])
+
+if test $ac_cv_c_compiler_gnu = yes ; then
+        CFLAGS="$CFLAGS -fvisibility=hidden -W -Wstrict-prototypes -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wno-parentheses -Wno-unused-parameter -Wno-sign-compare"
+        #CFLAGS="$CFLAGS -fvisibility=hidden -W -Wstrict-prototypes -Wmissing-prototypes -Wall -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wno-parentheses"
+fi
+
+AC_C99_FUNC_LRINTF
+AC_C99_FUNC_LRINT
+
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -121,9 +155,9 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
-AC_OUTPUT([Makefile libcelt/Makefile tests/Makefile celt.pc])
+AC_OUTPUT([Makefile libcelt/Makefile tests/Makefile celt.pc tools/Makefile])
 
-if test "x$src" = "x"; then 
+if test "x$tools" = "x"; then 
 echo "**IMPORTANT**"
 echo "You don't seem to have the development package for libogg (libogg-devel) installed. Only the library will be built (no encoder/decoder executable)"
 echo "You can download libogg from http://www.vorbis.com/download.psp"