[svn-commits] file: branch 1.6.0 r115331 - in /branches/1.6.0: ./ build_tools/ codecs/ incl...

[SVN commits to the Digium repositories]

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

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115331
Log:
Merged revisions 115328 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115328 | file | 2008-05-05 19:13:57 -0300 (Mon, 05 May 2008) | 10 lines

Merged revisions 115327 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115327 | file | 2008-05-05 19:10:05 -0300 (Mon, 05 May 2008) | 2 lines

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.6.0/   (props changed)
    branches/1.6.0/build_tools/menuselect-deps.in
    branches/1.6.0/codecs/codec_speex.c
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/menuselect-deps.in?view=diff&rev=115331&r1=115330&r2=115331
==============================================================================
--- branches/1.6.0/build_tools/menuselect-deps.in (original)
+++ branches/1.6.0/build_tools/menuselect-deps.in Mon May  5 17:17:05 2008
@@ -32,6 +32,7 @@
 RADIUS=@PBX_RADIUS@
 SPEEX=@PBX_SPEEX@
 SPEEXDSP=@PBX_SPEEXDSP@
+SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@
 SQLITE3=@PBX_SQLITE3@
 SQLITE=@PBX_SQLITE@
 SS7=@PBX_SS7@

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

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=115331&r1=115330&r2=115331
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon May  5 17:17:05 2008
@@ -1313,7 +1313,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.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=115331&r1=115330&r2=115331
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Mon May  5 17:17:05 2008
@@ -720,6 +720,12 @@
 
 /* Define to indicate the ${SPEEXDSP_DESCRIP} library version */
 #undef HAVE_SPEEXDSP_VERSION
+
+/* Define this to indicate the ${SPEEX_PREPROCESS_DESCRIP} library */
+#undef HAVE_SPEEX_PREPROCESS
+
+/* Define to indicate the ${SPEEX_PREPROCESS_DESCRIP} library version */
+#undef HAVE_SPEEX_PREPROCESS_VERSION
 
 /* Define to indicate the ${SPEEX_DESCRIP} library version */
 #undef HAVE_SPEEX_VERSION