[svn-commits] russell: trunk r89460 - in /trunk: configure configure.ac

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Nov 20 13:11:18 2007
New Revision: 89460

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89460
Log:
fix the zaptel configure script check

Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=89460&r1=89459&r2=89460
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Nov 20 13:11:18 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 89395 .
+# From configure.ac Revision: 89452 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -12403,11 +12403,13 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -12447,11 +12449,13 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -42025,12 +42029,12 @@
       if test "x${TONEZONE_DIR}" != "x"; then
 	 TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
       fi
-      TONEZONE_INCLUDE="${TONEZONE_INCLUDE} 140"
+      TONEZONE_INCLUDE="${TONEZONE_INCLUDE} "
       if test "xzaptel/tonezone.h" = "x" ; then	# no header, assume found
          TONEZONE_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE} 140"
+         CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE} "
 	 if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for zaptel/tonezone.h" >&5
 echo $ECHO_N "checking for zaptel/tonezone.h... $ECHO_C" >&6; }
@@ -42181,7 +42185,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_TONEZONE_VERSION 140
+#define HAVE_TONEZONE_VERSION
 _ACEOF
 
       fi
@@ -42282,12 +42286,12 @@
       if test "x${TONEZONE_DIR}" != "x"; then
 	 TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
       fi
-      TONEZONE_INCLUDE="${TONEZONE_INCLUDE} 80"
+      TONEZONE_INCLUDE="${TONEZONE_INCLUDE} "
       if test "xzaptel/zaptel.h" = "x" ; then	# no header, assume found
          TONEZONE_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE} 80"
+         CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE} "
 	 if test "${ac_cv_header_zaptel_zaptel_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for zaptel/zaptel.h" >&5
 echo $ECHO_N "checking for zaptel/zaptel.h... $ECHO_C" >&6; }
@@ -42438,7 +42442,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_TONEZONE_VERSION 80
+#define HAVE_TONEZONE_VERSION
 _ACEOF
 
       fi
@@ -43853,7 +43857,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_ZAPTEL_VERSION
+#define HAVE_ZAPTEL_VERSION 80
 _ACEOF
 
       fi
@@ -44109,7 +44113,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_ZAPTEL_VLDTMF_VERSION
+#define HAVE_ZAPTEL_VLDTMF_VERSION 90
 _ACEOF
 
       fi
@@ -44365,7 +44369,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_ZAPTEL_VLDTMF_VERSION
+#define HAVE_ZAPTEL_VLDTMF_VERSION 80
 _ACEOF
 
       fi
@@ -44623,7 +44627,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_TONEZONE_VERSION
+#define HAVE_TONEZONE_VERSION 80
 _ACEOF
 
       fi
@@ -45336,7 +45340,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_SDL_IMAGE_VERSION ${SDL_INCLUDE}
+#define HAVE_SDL_IMAGE_VERSION
 _ACEOF
 
       fi

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=89460&r1=89459&r2=89460
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Nov 20 13:11:18 2007
@@ -1070,9 +1070,9 @@
 fi
 
 # new tonezone, version 1.4.0
-AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/tonezone.h], [${tonezone_extra}], [140])
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/tonezone.h], [${tonezone_extra}], , [], [140])
 # other case, old tonezone (0.80)
-AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/zaptel.h], [${tonezone_extra}], [80])
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/zaptel.h], [${tonezone_extra}], , [], [80])
 
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])