kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

use tzafrir's patch to fix this problem properly... i made the previous set of changes without thoroughly testing them, doh!

Browse Source 
(closes issue #12911)
Reported by: tzafrir
Patches:
      custum_dahdi_configure_2.diff uploaded by tzafrir (license 46)
Tested by: tzafrir



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@128637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-07 16:51:50 +00:00
parent 7073477f44
commit d227632177
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 125132 . # From configure.ac Revision: 127754 .
# 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.4. # Generated by GNU Autoconf 2.61 for asterisk 1.4.
# #
@@ -28939,18 +28939,18 @@ fi
if test "${host_os}" != "linux-gnu" ; then if test "${host_os}" != "linux-gnu" ; then
tonezone_extra="-lm" tonezone_extra_lib="-lm"
fi fi
if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
tonezone_dir="dahdi" tonezone_dir="dahdi"
if test "x${DAHDI_DIR}" != "x"; then if test "x${DAHDI_DIR}" != "x"; then
tonezone_extra="${tonezone_extra} ${DAHDI_INCLUDE}" tonezone_extra_inc="${DAHDI_INCLUDE}"
fi fi
else else
tonezone_dir="zaptel" tonezone_dir="zaptel"
if test "x${ZAPTEL_DIR}" != "x"; then if test "x${ZAPTEL_DIR}" != "x"; then
tonezone_extra="${tonezone_extra} ${ZAPTEL_INCLUDE}" tonezone_extra_inc="${ZAPTEL_INCLUDE}"
fi fi
fi fi
@@ -28970,7 +28970,7 @@ if test "${ac_cv_lib_tonezone_tone_zone_find+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_lib} $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -29033,13 +29033,13 @@ fi
if test "${AST_TONEZONE_FOUND}" = "yes"; then if test "${AST_TONEZONE_FOUND}" = "yes"; then
TONEZONE_LIB="-ltonezone ${tonezone_extra}" TONEZONE_LIB="-ltonezone ${tonezone_extra_lib}"
TONEZONE_HEADER_FOUND="1" TONEZONE_HEADER_FOUND="1"
if test "x${TONEZONE_DIR}" != "x"; then if test "x${TONEZONE_DIR}" != "x"; then
TONEZONE_LIB="${pbxlibdir} ${TONEZONE_LIB}" TONEZONE_LIB="${pbxlibdir} ${TONEZONE_LIB}"
TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include" TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
fi fi
TONEZONE_INCLUDE="${TONEZONE_INCLUDE} " TONEZONE_INCLUDE="${TONEZONE_INCLUDE} ${tonezone_extra_inc}"
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}" CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}"
if test "x${tonezone_dir}/tonezone.h" != "x" ; then if test "x${tonezone_dir}/tonezone.h" != "x" ; then

8
configure.ac
View File

@@ -1355,22 +1355,22 @@ AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], []) AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
if test "${host_os}" != "linux-gnu" ; then if test "${host_os}" != "linux-gnu" ; then
tonezone_extra="-lm" tonezone_extra_lib="-lm"
fi fi
if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
tonezone_dir="dahdi" tonezone_dir="dahdi"
if test "x${DAHDI_DIR}" != "x"; then if test "x${DAHDI_DIR}" != "x"; then
tonezone_extra="${tonezone_extra} ${DAHDI_INCLUDE}" tonezone_extra_inc="${DAHDI_INCLUDE}"
fi fi
else else
tonezone_dir="zaptel" tonezone_dir="zaptel"
if test "x${ZAPTEL_DIR}" != "x"; then if test "x${ZAPTEL_DIR}" != "x"; then
tonezone_extra="${tonezone_extra} ${ZAPTEL_INCLUDE}" tonezone_extra_inc="${ZAPTEL_INCLUDE}"
fi fi
fi fi
AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [${tonezone_dir}/tonezone.h], [${tonezone_extra}]) AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [${tonezone_dir}/tonezone.h], [${tonezone_extra_lib}], [${tonezone_extra_inc}])
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])