[svn-commits] kpfleming: branch 1.4 r128637 - in /branches/1.4: configure configure.ac

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Jul  7 11:51:50 2008
New Revision: 128637

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128637
Log:
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


Modified:
    branches/1.4/configure
    branches/1.4/configure.ac

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=128637&r1=128636&r2=128637
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Mon Jul  7 11:51:50 2008
@@ -1355,22 +1355,22 @@
 AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
 
 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}"
-   fi
-fi
-
-AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [${tonezone_dir}/tonezone.h], [${tonezone_extra}])
+      tonezone_extra_inc="${ZAPTEL_INCLUDE}"
+   fi
+fi
+
+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], [])