kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

some minor fixes found while working on issue #12911 (and block the rev from 1.4 since the equivalent is already here)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-03 16:22:02 +00:00
parent e4c93fc8c3
commit e99eece42a
3 changed files with 99 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@@ -192,7 +192,7 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
$1_HEADER_FOUND="1" $1_HEADER_FOUND="1"
else # check for the header else # check for the header
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE} $6" CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
fi fi

14
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 126356 . # From configure.ac Revision: 127017 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # Generated by GNU Autoconf 2.61 for asterisk 1.6.
# #
@@ -45579,10 +45579,6 @@ if test "${host_os}" != "linux-gnu" ; then
tonezone_extra="-lm" tonezone_extra="-lm"
fi fi
if test "x${DAHDI_DIR}" != "x"; then
tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
fi
if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then
pbxlibdir="" pbxlibdir=""
@@ -45605,7 +45601,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} $LIBS" LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} ${DAHDI_INCLUDE} $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -45671,7 +45667,7 @@ fi
# now check for the header. # now check for the header.
if test "${AST_TONEZONE_FOUND}" = "yes"; then if test "${AST_TONEZONE_FOUND}" = "yes"; then
TONEZONE_LIB="${pbxlibdir} -ltonezone ${tonezone_extra}" TONEZONE_LIB="${pbxlibdir} -ltonezone ${tonezone_extra} ${DAHDI_INCLUDE}"
# if --with-TONEZONE=DIR has been specified, use it. # if --with-TONEZONE=DIR has been specified, use it.
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"
@@ -47358,7 +47354,7 @@ fi
SDL_IMAGE_HEADER_FOUND="1" SDL_IMAGE_HEADER_FOUND="1"
else # check for the header else # check for the header
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE} ${SDL_INCLUDE}" CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}"
if test "${ac_cv_header_SDL_image_h+set}" = set; then if test "${ac_cv_header_SDL_image_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for SDL_image.h" >&5 { echo "$as_me:$LINENO: checking for SDL_image.h" >&5
echo $ECHO_N "checking for SDL_image.h... $ECHO_C" >&6; } echo $ECHO_N "checking for SDL_image.h... $ECHO_C" >&6; }
@@ -48284,7 +48280,7 @@ fi
X11_HEADER_FOUND="1" X11_HEADER_FOUND="1"
else # check for the header else # check for the header
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE} -I/usr/X11R6/include" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
if test "${ac_cv_header_X11_Xlib_h+set}" = set; then if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }

6
configure.ac
View File

@@ -1419,11 +1419,7 @@ if test "${host_os}" != "linux-gnu" ; then
tonezone_extra="-lm" tonezone_extra="-lm"
fi fi
if test "x${DAHDI_DIR}" != "x"; then AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra} ${DAHDI_INCLUDE}])
tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
fi
AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}])
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])