Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

fix the zaptel configure script check

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Russell Bryant 18 years ago
parent 776c73ed5e
commit 90296ccdfe
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File

32
configure vendored
Unescape View File

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

4
configure.ac
Unescape View File

@ -1070,9 +1070,9 @@ if test "${host_os}" != "linux-gnu" ; then
fi fi
# new tonezone, version 1.4.0 # 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) # 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], []) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])

Write Preview
Loading…
Cancel
Save