X-Git-Url: http://git.xiph.org/?p=opus.git;a=blobdiff_plain;f=configure.ac;h=4783fc353311fc18b9a5e1656a02cebdf3fe35e3;hp=65e4fbd8ff815bd98e0e2f338c6504cdcfe0d77d;hb=9edde42690a11afea6681275411d2c5f16484ea4;hpb=f81a60ca56f3b179c9433900e9cf5bf28e6f2ac8

diff --git a/configure.ac b/configure.ac
index 65e4fbd8..4783fc35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,30 +1,30 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
-AC_INIT(libcelt/arch.h)
+AC_INIT(src/opus_encoder.c)
 
 AM_CONFIG_HEADER([config.h])
 
-CELT_MAJOR_VERSION=0
-CELT_MINOR_VERSION=8
-CELT_MICRO_VERSION=1
-CELT_EXTRA_VERSION=
-CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
-LIBCELT_SUFFIX=0
+OPUS_MAJOR_VERSION=0
+OPUS_MINOR_VERSION=9
+OPUS_MICRO_VERSION=4
+OPUS_EXTRA_VERSION=
+OPUS_VERSION=$OPUS_MAJOR_VERSION.$OPUS_MINOR_VERSION.$OPUS_MICRO_VERSION$OPUS_EXTRA_VERSION
+LIBOPUS_SUFFIX=0
 
-CELT_LT_CURRENT=1
-CELT_LT_REVISION=0
-CELT_LT_AGE=0
+OPUS_LT_CURRENT=0
+OPUS_LT_REVISION=0
+OPUS_LT_AGE=0
 
-AC_SUBST(CELT_LT_CURRENT)
-AC_SUBST(CELT_LT_REVISION)
-AC_SUBST(CELT_LT_AGE)
-AC_SUBST(LIBCELT_SUFFIX)
+AC_SUBST(OPUS_LT_CURRENT)
+AC_SUBST(OPUS_LT_REVISION)
+AC_SUBST(OPUS_LT_AGE)
+AC_SUBST(LIBOPUS_SUFFIX)
 
 # For automake.
-VERSION=$CELT_VERSION
-PACKAGE=celt
+VERSION=$OPUS_VERSION
+PACKAGE=opus
 
-AC_SUBST(CELT_VERSION)
+AC_SUBST(OPUS_VERSION)
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AM_MAINTAINER_MODE
@@ -38,7 +38,7 @@ AC_C_CONST
 AC_C_INLINE
 AC_C_RESTRICT
 
-AC_DEFINE([CELT_BUILD], [], [This is a build of CELT])
+AC_DEFINE([OPUS_BUILD], [], [This is a build of OPUS])
 
 AC_MSG_CHECKING(for C99 variable-size arrays)
 AC_TRY_COMPILE( , [
@@ -67,31 +67,13 @@ has_alloca=no
 )
 AC_MSG_RESULT($has_alloca)
 
-AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
-
-AS_IF([test "x$with_ogg" != xno],
- [XIPH_PATH_OGG([tools="tools"], [tools=""])],
- [tools=""])
-AC_SUBST(tools)
-
 AC_CHECK_LIB(m, sin)
 
-# Check for getopt_long; if not found, use included source.
-AC_CHECK_FUNCS([getopt_long],,
-[# FreeBSD has a gnugetopt library.
-  AC_CHECK_LIB([gnugetopt],[getopt_long],
-[AC_DEFINE([HAVE_GETOPT_LONG])],
-[# Use the GNU replacement.
-AC_LIBOBJ(getopt)
-AC_LIBOBJ(getopt1)])])
-
-AC_CHECK_LIB(winmm, main)
-
-AC_DEFINE_UNQUOTED(CELT_VERSION, "${CELT_VERSION}", [Complete version string])
-AC_DEFINE_UNQUOTED(CELT_MAJOR_VERSION, ${CELT_MAJOR_VERSION}, [Version major])
-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_DEFINE_UNQUOTED(OPUS_VERSION, "${OPUS_VERSION}", [Complete version string])
+AC_DEFINE_UNQUOTED(OPUS_MAJOR_VERSION, ${OPUS_MAJOR_VERSION}, [Version major])
+AC_DEFINE_UNQUOTED(OPUS_MINOR_VERSION, ${OPUS_MINOR_VERSION}, [Version minor])
+AC_DEFINE_UNQUOTED(OPUS_MICRO_VERSION, ${OPUS_MICRO_VERSION}, [Version micro])
+AC_DEFINE_UNQUOTED(OPUS_EXTRA_VERSION, "${OPUS_EXTRA_VERSION}", [Version extra])
 
 has_float_approx=no
 #case "$host_cpu" in
@@ -104,7 +86,7 @@ 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([FIXED_POINT], [1], [Compile as fixed-point])
 else
   AC_DEFINE([FLOATING_POINT], , [Compile as floating-point])
 fi],
@@ -117,8 +99,22 @@ AC_ARG_ENABLE(fixed-point-debug, [  --enable-fixed-point-debug  debug fixed-poin
   AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])
 fi])
 
+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_enable_experimental_postfilter="yes"
+  AC_DEFINE([ENABLE_POSTFILTER], , [Postfilter])
+fi])
+
+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_enable_custom_modes="yes"
+  AC_DEFINE([CUSTOM_MODES], , [Custom modes])
+fi])
+
 float_approx=$has_float_approx
-AC_ARG_ENABLE(float-approx, [  --disable-float-approx  do not use fast approximations for floating point],
+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
@@ -130,13 +126,6 @@ if test "x${float_approx}" = "xyes"; then
     AC_DEFINE([FLOAT_APPROX], , [Float approximations])
 fi
 
-ac_enable_static_modes="no"
-AC_ARG_ENABLE(static-modes, [  --enable-static-modes   use pre-computed codec configurations],
-[if test "$enableval" = yes; then
-  ac_enable_static_modes="yes"
-  AC_DEFINE([STATIC_MODES], , [Static modes])
-fi])
-
 ac_enable_assertions="no"
 AC_ARG_ENABLE(assertions, [  --enable-assertions     enable additional software error checking],
 [if test "$enableval" = yes; then
@@ -144,6 +133,7 @@ AC_ARG_ENABLE(assertions, [  --enable-assertions     enable additional software
   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])
@@ -153,13 +143,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)
@@ -195,8 +186,13 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
-AC_OUTPUT([Makefile libcelt/Makefile tests/Makefile 
-           celt.pc tools/Makefile libcelt.spec ])
+if test "$OPUS_BUILD" = "true" ; then
+AC_DEFINE(OPUS_BUILD, [], [We're part of Opus])
+fi
+
+AM_CONDITIONAL([FIXED_POINT], [test x$ac_enable_fixed = xyes])
+
+AC_OUTPUT([Makefile])
 
 AC_MSG_RESULT([
 ------------------------------------------------------------------------
@@ -205,7 +201,7 @@ AC_MSG_RESULT([
     Compiler support:
 
       C99 var arrays: ................ ${has_var_arrays}
-      C99 lrintf: .................... ${ac_cv_c99_lrintf}
+      C99 lrintf: .................... ${ac_cv_func_lrintf}
       Alloca: ........................ ${has_alloca}
     
     General configuration:
@@ -213,16 +209,10 @@ AC_MSG_RESULT([
       Fast float approximations: ..... ${float_approx}
       Fixed point support: ........... ${ac_enable_fixed}
       Fixed point debugging: ......... ${ac_enable_fixed_debug}
-      Static modes: .................. ${ac_enable_static_modes}
+      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)"
-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";