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

(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

14
configure vendored
View File

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