From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 9 Jul 2007 21:32:53 +0000 (+0000)
Subject: Merged revisions 74211 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54d8fd09688dacedfedfcaf1ea300bfa8edcdbd2;p=thirdparty%2Fasterisk.git

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.

........


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

diff --git a/configure b/configure
index 9918030085..6b8969b541 100755
--- a/configure
+++ b/configure
@@ -12127,11 +12127,13 @@ _ACEOF
 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 confdefs.h >>conftest.$ac_ext
 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 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then
       	 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
diff --git a/configure.ac b/configure.ac
index f7b04dec25..4766e5608e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -773,7 +773,7 @@ fi
 
 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])