[svn-commits] russell: branch 1.6.0 r119796 - in /branches/1.6.0: ./ build_tools/ include/a...

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jun  2 10:46:07 2008
New Revision: 119796

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

........
r119795 | russell | 2008-06-02 10:43:40 -0500 (Mon, 02 Jun 2008) | 2 lines

Add a configure script check for spandsp

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/menuselect-deps.in
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in
    branches/1.6.0/makeopts.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=119796&r1=119795&r2=119796
==============================================================================
--- branches/1.6.0/build_tools/menuselect-deps.in (original)
+++ branches/1.6.0/build_tools/menuselect-deps.in Mon Jun  2 10:46:07 2008
@@ -30,6 +30,7 @@
 PORTAUDIO=@PBX_PORTAUDIO@
 PRI=@PBX_PRI@
 RADIUS=@PBX_RADIUS@
+SPANDSP=@PBX_SPANDSP@
 SPEEX=@PBX_SPEEX@
 SPEEXDSP=@PBX_SPEEXDSP@
 SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=119796&r1=119795&r2=119796
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Jun  2 10:46:07 2008
@@ -233,6 +233,7 @@
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
 AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
 AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
 AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
@@ -1289,6 +1290,12 @@
 
 AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
 
+AST_C_COMPILE_CHECK([SPANDSP], [
+		#if SPANDSP_RELEASE_DATE < 20080516
+		#error "spandsp 0.0.5 or greater is required"
+		#endif
+	], [spandsp/version.h])
+
 AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
 
 if test "${USE_PWLIB}" != "no"; then

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=119796&r1=119795&r2=119796
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Mon Jun  2 10:46:07 2008
@@ -714,6 +714,12 @@
 
 /* Define to 1 if your system has soxmix application. */
 #undef HAVE_SOXMIX
+
+/* Define if your system has the SPANDSP headers. */
+#undef HAVE_SPANDSP
+
+/* Define SPANDSP headers version */
+#undef HAVE_SPANDSP_VERSION
 
 /* Define this to indicate the ${SPEEX_DESCRIP} library */
 #undef HAVE_SPEEX

Modified: branches/1.6.0/makeopts.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/makeopts.in?view=diff&rev=119796&r1=119795&r2=119796
==============================================================================
--- branches/1.6.0/makeopts.in (original)
+++ branches/1.6.0/makeopts.in Mon Jun  2 10:46:07 2008
@@ -169,6 +169,9 @@
 SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@
 SDL_IMAGE_LIB=@SDL_IMAGE_LIB@
 
+SPANDSP_INCLUDE=@SPANDSP_INCLUDE@
+SPANDSP_LIB=@SPANDSP_LIB@
+
 SPEEX_INCLUDE=@SPEEX_INCLUDE@
 SPEEX_LIB=@SPEEX_LIB@