[asterisk-commits] russell: trunk r74212 - in /trunk: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jul  9 16:32:53 2007
New Revision: 74212

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74212
Log:
Merged revisions 74211 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r74211 | russell | 2007-07-09 16:31:30 -0500 (Mon, 09 Jul 2007) | 5 lines

Update the configure script to check for a required function that is not present
in the 1.2 version of libpri.  This will prevent the configure script from thinking
that it has compatible libpri support for Asterisk 1.4, when it actually does not
because the installed version is from 1.2.

........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=74212&r1=74211&r2=74212
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Mon Jul  9 16:32:53 2007
@@ -12127,11 +12127,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;
 }
@@ -12171,11 +12173,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;
 }
@@ -28942,7 +28946,7 @@
       	 pbxlibdir="-L${PRI_DIR}"
       fi
    fi
-   pbxfuncname="pri_call"
+   pbxfuncname="pri_keypad_facility"
    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
       AST_PRI_FOUND=yes
    else

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=74212&r1=74211&r2=74212
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jul  9 16:32:53 2007
@@ -773,7 +773,7 @@
 
 AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
 
-AST_EXT_LIB_CHECK([PRI], [pri], [pri_call], [libpri.h])
+AST_EXT_LIB_CHECK([PRI], [pri], [pri_keypad_facility], [libpri.h])
 
 AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_new], [libss7.h])