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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164266 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_fax.c

@@ -29,6 +29,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <tiffio.h>
 
 #include <spandsp.h>
+#ifdef HAVE_SPANDSP_EXPOSE_H
+#include <spandsp/expose.h>
+#endif
 #include <spandsp/version.h>
 
 #include "asterisk/lock.h"

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 160101 .
+# From configure.ac Revision: 163170 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -40426,6 +40426,62 @@ _ACEOF
    fi
 fi
 
+fi
+
+if test "x${PBX_SPANDSP}" = "x1" ; then
+	{ echo "$as_me:$LINENO: checking for spandsp/expose.h" >&5
+echo $ECHO_N "checking for spandsp/expose.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_spandsp_expose_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <spandsp.h>
+
+#include <spandsp/expose.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_spandsp_expose_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_spandsp_expose_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_expose_h" >&5
+echo "${ECHO_T}$ac_cv_header_spandsp_expose_h" >&6; }
+if test $ac_cv_header_spandsp_expose_h = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SPANDSP_EXPOSE_H 1
+_ACEOF
+
+fi
+
+
 fi
 
 

configure.ac

@@ -1360,6 +1360,10 @@ if test "x${PBX_SPANDSP}" = "x1" ; then
 	AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [t38_terminal_init], [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

include/asterisk/autoconfig.h.in

@@ -758,6 +758,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