[asterisk-commits] russell: branch 1.6.0 r119800 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jun  2 10:58:41 2008
New Revision: 119800

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

........
r119799 | russell | 2008-06-02 10:57:43 -0500 (Mon, 02 Jun 2008) | 4 lines

After determining that the version of spandsp installed is an acceptable version,
do a build and link test to ensure that the library is usable, and that libtiff
is also available

........

Modified:
    branches/1.6.0/   (props changed)
    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/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=119800&r1=119799&r2=119800
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Jun  2 10:58:41 2008
@@ -1296,6 +1296,13 @@
 		#endif
 	], [spandsp/version.h])
 
+if test "x${PBX_SPANDSP}" = "x1" ; then
+	# We found the correct version in the header, now let's make sure it links
+	# properly, and that libtiff is available
+	PBX_SPANDSP=0
+	AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
+fi
+
 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=119800&r1=119799&r2=119800
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Mon Jun  2 10:58:41 2008
@@ -715,10 +715,10 @@
 /* Define to 1 if your system has soxmix application. */
 #undef HAVE_SOXMIX
 
-/* Define if your system has the SPANDSP headers. */
+/* Define this to indicate the ${SPANDSP_DESCRIP} library */
 #undef HAVE_SPANDSP
 
-/* Define SPANDSP headers version */
+/* Define to indicate the ${SPANDSP_DESCRIP} library version */
 #undef HAVE_SPANDSP_VERSION
 
 /* Define this to indicate the ${SPEEX_DESCRIP} library */