[svn-commits] file: branch 1.6.0 r164265 - in /branches/1.6.0: ./ apps/ include/asterisk/

[SVN commits to the Digium repositories]

Author: file
Date: Mon Dec 15 09:48:22 2008
New Revision: 164265

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

........
  r164257 | file | 2008-12-15 11:41:22 -0400 (Mon, 15 Dec 2008) | 4 lines
  
  Make app_fax compatible with newer versions of spandsp. This remains backwards compatible with earlier versions though so do not fret.
  (closes issue #14073)
  Reported by: seandarcy
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_fax.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/apps/app_fax.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_fax.c?view=diff&rev=164265&r1=164264&r2=164265
==============================================================================
--- branches/1.6.0/apps/app_fax.c (original)
+++ branches/1.6.0/apps/app_fax.c Mon Dec 15 09:48:22 2008
@@ -29,6 +29,9 @@
 #include <tiffio.h>
 
 #include <spandsp.h>
+#ifdef HAVE_SPANDSP_EXPOSE_H
+#include <spandsp/expose.h>
+#endif
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=164265&r1=164264&r2=164265
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Dec 15 09:48:22 2008
@@ -1340,6 +1340,10 @@
 	AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
 fi
 
+if test "x${PBX_SPANDSP}" = "x1" ; then
+	AC_CHECK_HEADER([spandsp/expose.h], [AC_DEFINE_UNQUOTED([HAVE_SPANDSP_EXPOSE_H], 1, [Define to 1 if spandsp/expose.h is available.])], [], [#include <spandsp.h>])
+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=164265&r1=164264&r2=164265
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Mon Dec 15 09:48:22 2008
@@ -735,6 +735,9 @@
 
 /* Define this to indicate the ${SPANDSP_DESCRIP} library */
 #undef HAVE_SPANDSP
+
+/* Define to 1 if spandsp/expose.h is available. */
+#undef HAVE_SPANDSP_EXPOSE_H
 
 /* Define to indicate the ${SPANDSP_DESCRIP} library version */
 #undef HAVE_SPANDSP_VERSION