(closes issue #12846)

Reported by: Netview
Tested by: jpeeler

Use correct location to search for tonezone.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122613 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 8f3bce1a399cefec6660e8a8e3454d141acd064a..c992e24a54d3c207ca4d9d387e1fcde195a83bde 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 121802 .
+# From configure.ac Revision: 122314 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -32918,7 +32918,7 @@ if test "${host_os}" != "linux-gnu" ; then
   tonezone_extra="-lm"
 fi
 
-if test "${USE_DAHDI}" != "no" ; then
+if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
   tonezone_dir="dahdi"
 else
   tonezone_dir="zaptel"

diff --git a/configure.ac b/configure.ac
index f8548b7565b724d70d62ec313a27256e86580b36..79ebbe8edcbc1edc03ca6e68c78d0608242b96ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1358,7 +1358,7 @@ if test "${host_os}" != "linux-gnu" ; then
   tonezone_extra="-lm"
 fi
 
-if test "${USE_DAHDI}" != "no" ; then
+if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
   tonezone_dir="dahdi"
 else
   tonezone_dir="zaptel"