diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-28 13:44:24 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-28 13:44:24 +0000 |
commit | e578da47cae4c959e59aa26e4f75e9aafa1e9827 (patch) | |
tree | beac4ee5d15eb0620e419b480af3c0faa85450d8 | |
parent | 049cfb2ffbebb8253697be46f55f9cd4d7d93b32 (diff) |
Merged revisions 114713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r114713 | file | 2008-04-28 10:42:13 -0300 (Mon, 28 Apr 2008) | 2 lines
Update autoconf logic with latest API change for libss7.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114714 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | configure | 16 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 109282 . +# From configure.ac Revision: 114697 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -12769,11 +12769,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; } @@ -12813,11 +12815,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; } @@ -38572,7 +38576,7 @@ if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then pbxlibdir="-L${SS7_DIR}" fi fi - pbxfuncname="isup_cqr" + pbxfuncname="isup_set_generic_name" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_SS7_FOUND=yes else diff --git a/configure.ac b/configure.ac index b225f0ab8..a878707a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1267,7 +1267,7 @@ AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h]) AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h]) -AST_EXT_LIB_CHECK([SS7], [ss7], [isup_cqr], [libss7.h]) +AST_EXT_LIB_CHECK([SS7], [ss7], [isup_set_generic_name], [libss7.h]) if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then |