[svn-commits] file: branch 1.4 r115327 - in /branches/1.4: ./ build_tools/ codecs/ include/...

[SVN commits to the Digium repositories]

Author: file
Date: Mon May  5 17:10:05 2008
New Revision: 115327

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115327
Log:
Make sure that either the main speex library contains preprocess functions or that speexdsp does. If both fail then speex stuff can not be built.

Modified:
    branches/1.4/build_tools/menuselect-deps.in
    branches/1.4/codecs/codec_speex.c
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/include/asterisk/autoconfig.h.in

Modified: branches/1.4/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/menuselect-deps.in?view=diff&rev=115327&r1=115326&r2=115327
==============================================================================
--- branches/1.4/build_tools/menuselect-deps.in (original)
+++ branches/1.4/build_tools/menuselect-deps.in Mon May  5 17:10:05 2008
@@ -23,6 +23,7 @@
 RADIUS=@PBX_RADIUS@
 SPEEX=@PBX_SPEEX@
 SPEEXDSP=@PBX_SPEEXDSP@
+SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@
 SQLITE=@PBX_SQLITE@
 SSL=@PBX_OPENSSL@
 TONEZONE=@PBX_TONEZONE@

Modified: branches/1.4/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/codecs/codec_speex.c?view=diff&rev=115327&r1=115326&r2=115327
==============================================================================
--- branches/1.4/codecs/codec_speex.c (original)
+++ branches/1.4/codecs/codec_speex.c Mon May  5 17:10:05 2008
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<depend>speex</depend>
+	<depend>speex_preprocess</depend>
 	<use>speexdsp</use>
  ***/
 

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=115327&r1=115326&r2=115327
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Mon May  5 17:10:05 2008
@@ -1269,7 +1269,18 @@
 
 AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
 
+# See if the main speex library contains the preprocess functions
+AST_EXT_LIB_CHECK([SPEEX_PREPROCESS], [speex_preprocess_ctl], [speex/speex.h], [-lm])
+if test "${PBX_SPEEX_PREPROCESS}" = 1; then
+   PBX_SPEEX_PREPROCESS=1
+fi
+
 AST_EXT_LIB_CHECK([SPEEXDSP], [speexdsp], [speex_preprocess_ctl], [speex/speex.h], [-lm])
+if test "${PBX_SPEEXDSP}" = 1; then
+   PBX_SPEEX_PREPROCESS=1
+fi
+
+AC_SUBST(PBX_SPEEX_PREPROCESS)
 
 AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
 

Modified: branches/1.4/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/autoconfig.h.in?view=diff&rev=115327&r1=115326&r2=115327
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Mon May  5 17:10:05 2008
@@ -340,6 +340,9 @@
 
 /* Define to indicate the ${SPEEXDSP_DESCRIP} library */
 #undef HAVE_SPEEXDSP
+
+/* Define to indicate the ${SPEEX_PREPROCESS_DESCRIP} library */
+#undef HAVE_SPEEX_PREPROCESS
 
 /* Define to indicate the ${SQLITE_DESCRIP} library */
 #undef HAVE_SQLITE