[svn-commits] trunk r35812 - in /trunk: ./ apps/ build_tools/ channels/ codecs/ include/ast...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sat Jun 24 01:45:50 MST 2006


Author: kpfleming
Date: Sat Jun 24 03:45:49 2006
New Revision: 35812

URL: http://svn.digium.com/view/asterisk?rev=35812&view=rev
Log:
search for Zaptel and libtonezone separately in the configure script
various other minor fixes

Modified:
    trunk/apps/Makefile
    trunk/apps/app_rpt.c
    trunk/build_tools/menuselect-deps.in
    trunk/channels/Makefile
    trunk/channels/chan_zap.c
    trunk/codecs/Makefile
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in
    trunk/makeopts.in

Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Sat Jun 24 03:45:49 2006
@@ -35,9 +35,12 @@
 	$(CC) $(SOLINK) -o $@ $<
 
 app_rpt.so: app_rpt.o
-	$(CC) $(SOLINK) -o $@ $< $(ZAPTEL_LIB)
+	$(CC) $(SOLINK) -o $@ $< $(TONEZONE_LIB)
 
 app_rpt.o: app_rpt.c
+	$(CC) -c -o $@ $(CFLAGS) $(TONEZONE_INCLUDE) $(ZAPTEL_INCLUDE) $<
+
+app_flash.o app_meetme.o app_page.o app_zapbarge.o app_zapras.o app_zapscan.o: %.o: %.c
 	$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
 
 install: all

Modified: trunk/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_rpt.c?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Sat Jun 24 03:45:49 2006
@@ -118,6 +118,7 @@
 
 /*** MODULEINFO
 	<depend>zaptel</depend>
+	<depend>tonezone</depend>
 	<defaultenabled>no</defaultenabled>
  ***/
 

Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/menuselect-deps.in?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Sat Jun 24 03:45:49 2006
@@ -22,7 +22,8 @@
 VPBAPI=@PBX_LIBvpb@
 WIN32=@OSISWIN32@
 ZLIB=@PBX_LIBZLIB@
-ZAPTEL=@PBX_LIBZAPTEL@
+TONEZONE=@PBX_LIBTONEZONE@
+ZAPTEL=@PBX_ZAPTEL@
 LIBGSM=@PBX_LIBgsm@
 IKSEMEL=@PBX_LIBIKSEMEL@
 IXJUSER=@PBX_IXJUSER@

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Sat Jun 24 03:45:49 2006
@@ -113,13 +113,13 @@
 	$(CC) $(SOLINK) -o $@ chan_oss.o $(OSSAUDIO_LIB)
 
 chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
-	$(CC) $(SOLINK) -o $@ $< iax2-parser.o iax2-provision.o
+	$(CC) $(SOLINK) -o $@ $^
 
 chan_zap.so: chan_zap.o
-	$(CC) $(SOLINK) -o $@ $< $(PRI_LIB) $(ZAPTEL_LIB)
+	$(CC) $(SOLINK) -o $@ $< $(PRI_LIB) $(TONEZONE_LIB)
 
 chan_zap.o: chan_zap.c
-	$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
+	$(CC) -c -o $@ $(CFLAGS) $(TONEZONE_INCLUDE) $(ZAPTEL_INCLUDE) $<
 
 chan_alsa.so: chan_alsa.o
 	$(CC) $(SOLINK) -o $@ $< $(ASOUND_LIB)

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Sat Jun 24 03:45:49 2006
@@ -39,6 +39,7 @@
 
 /*** MODULEINFO
 	<depend>zaptel</depend>
+	<depend>tonezone</depend>
  ***/
 
 #include "asterisk.h"

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Sat Jun 24 03:45:49 2006
@@ -92,6 +92,9 @@
 codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
 	$(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm
 
+codec_zap.o: codec_zap.c
+	$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
+
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ $<
 

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=35812&r1=35811&r2=35812&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sat Jun 24 03:45:49 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 35439 .
+# From configure.ac Revision: 35607 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -755,9 +755,11 @@
 OSS_LIB
 OSS_INCLUDE
 PBX_LIBOSS
-ZAPTEL_LIB
+TONEZONE_LIB
+TONEZONE_INCLUDE
+PBX_LIBTONEZONE
 ZAPTEL_INCLUDE
-PBX_LIBZAPTEL
+PBX_ZAPTEL
 gsm_LIB
 gsm_INCLUDE
 PBX_LIBgsm
@@ -1410,7 +1412,8 @@
   --with-vorbis=PATH      use Vorbis files in PATH
   --with-z=PATH           use zlib files in PATH
   --with-ossaudio=PATH    use Open Sound System files in PATH
-  --with-tonezone=PATH    use Zaptel files in PATH
+  --with-tonezone=PATH    use tonezone files in PATH
+  --with-zaptel=PATH      use Zaptel files in PATH
   --with-gsm=PATH         use libgsm files in PATH, or 'internal'
   --with-pq=PATH          use PostgreSQL files in PATH
   --with-vpb=PATH         use vpb files in PATH
@@ -16249,25 +16252,25 @@
   withval=$with_tonezone;
 case ${withval} in
      n|no)
-     USE_ZAPTEL=no
+     USE_TONEZONE=no
      ;;
      y|ye|yes)
-     ZAPTEL_MANDATORY="yes"
+     TONEZONE_MANDATORY="yes"
      ;;
      *)
-     ZAPTEL_DIR="${withval}"
-     ZAPTEL_MANDATORY="yes"
+     TONEZONE_DIR="${withval}"
+     TONEZONE_MANDATORY="yes"
      ;;
 esac
 
 fi
 
 
-PBX_LIBZAPTEL=0
-
-if test "${USE_ZAPTEL}" != "no"; then
+PBX_LIBTONEZONE=0
+
+if test "${USE_TONEZONE}" != "no"; then
    pbxlibdir=""
-   if test "x${ZAPTEL_DIR}" != "x"; then
+   if test "x${TONEZONE_DIR}" != "x"; then
       pbxlibdir="-L${tonezone_DIR}/lib"
    fi
    { echo "$as_me:$LINENO: checking for tone_zone_find in -ltonezone" >&5
@@ -16348,23 +16351,23 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
 echo "${ECHO_T}$ac_cv_lib_tonezone_tone_zone_find" >&6; }
 if test $ac_cv_lib_tonezone_tone_zone_find = yes; then
-  AST_ZAPTEL_FOUND=yes
-else
-  AST_ZAPTEL_FOUND=no
-fi
-
-
-   if test "${AST_ZAPTEL_FOUND}" = "yes"; then
-      ZAPTEL_LIB="-ltonezone "
-      ZAPTEL_HEADER_FOUND="1"
-      if test "x${ZAPTEL_DIR}" != "x"; then
-         ZAPTEL_LIB="${pbxlibdir} ${ZAPTEL_LIB}"
-	 ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
-	 if test "xlinux/zaptel.h" != "x" ; then
-	    as_ac_Header=`echo "ac_cv_header_${ZAPTEL_DIR}/include/linux/zaptel.h" | $as_tr_sh`
+  AST_TONEZONE_FOUND=yes
+else
+  AST_TONEZONE_FOUND=no
+fi
+
+
+   if test "${AST_TONEZONE_FOUND}" = "yes"; then
+      TONEZONE_LIB="-ltonezone "
+      TONEZONE_HEADER_FOUND="1"
+      if test "x${TONEZONE_DIR}" != "x"; then
+         TONEZONE_LIB="${pbxlibdir} ${TONEZONE_LIB}"
+	 TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
+	 if test "xtonezone.h" != "x" ; then
+	    as_ac_Header=`echo "ac_cv_header_${TONEZONE_DIR}/include/tonezone.h" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/linux/zaptel.h" >&5
-echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/linux/zaptel.h... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/tonezone.h... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
@@ -16373,8 +16376,8 @@
 echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/linux/zaptel.h usability" >&5
-echo $ECHO_N "checking ${ZAPTEL_DIR}/include/linux/zaptel.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/tonezone.h usability" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/tonezone.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16382,7 +16385,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <${ZAPTEL_DIR}/include/linux/zaptel.h>
+#include <${TONEZONE_DIR}/include/tonezone.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -16431,15 +16434,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/linux/zaptel.h presence" >&5
-echo $ECHO_N "checking ${ZAPTEL_DIR}/include/linux/zaptel.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/tonezone.h presence" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/tonezone.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <${ZAPTEL_DIR}/include/linux/zaptel.h>
+#include <${TONEZONE_DIR}/include/tonezone.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -16479,30 +16482,30 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/linux/zaptel.h" >&5
-echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/linux/zaptel.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/tonezone.h... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16514,27 +16517,27 @@
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  ZAPTEL_HEADER_FOUND=1
-else
-  ZAPTEL_HEADER_FOUND=0
+  TONEZONE_HEADER_FOUND=1
+else
+  TONEZONE_HEADER_FOUND=0
 fi
 
 
 	 fi
       else
-	 if test "xlinux/zaptel.h" != "x" ; then
-            if test "${ac_cv_header_linux_zaptel_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for linux/zaptel.h" >&5
-echo $ECHO_N "checking for linux/zaptel.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_zaptel_h+set}" = set; then
+	 if test "xtonezone.h" != "x" ; then
+            if test "${ac_cv_header_tonezone_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for tonezone.h" >&5
+echo $ECHO_N "checking for tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_tonezone_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_zaptel_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_zaptel_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_tonezone_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking linux/zaptel.h usability" >&5
-echo $ECHO_N "checking linux/zaptel.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking tonezone.h usability" >&5
+echo $ECHO_N "checking tonezone.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16542,7 +16545,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <linux/zaptel.h>
+#include <tonezone.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -16591,15 +16594,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking linux/zaptel.h presence" >&5
-echo $ECHO_N "checking linux/zaptel.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking tonezone.h presence" >&5
+echo $ECHO_N "checking tonezone.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <linux/zaptel.h>
+#include <tonezone.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -16639,72 +16642,72 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: linux/zaptel.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: tonezone.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: linux/zaptel.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: linux/zaptel.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: linux/zaptel.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: linux/zaptel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: linux/zaptel.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: linux/zaptel.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: tonezone.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: tonezone.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: tonezone.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: tonezone.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: tonezone.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: tonezone.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for linux/zaptel.h" >&5
-echo $ECHO_N "checking for linux/zaptel.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_zaptel_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for tonezone.h" >&5
+echo $ECHO_N "checking for tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_tonezone_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header_linux_zaptel_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_zaptel_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_zaptel_h" >&6; }
-
-fi
-if test $ac_cv_header_linux_zaptel_h = yes; then
-  ZAPTEL_HEADER_FOUND=1
-else
-  ZAPTEL_HEADER_FOUND=0
+  ac_cv_header_tonezone_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_tonezone_h" >&6; }
+
+fi
+if test $ac_cv_header_tonezone_h = yes; then
+  TONEZONE_HEADER_FOUND=1
+else
+  TONEZONE_HEADER_FOUND=0
 fi
 
 
 	 fi
       fi
-      if test "x${ZAPTEL_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${ZAPTEL_MANDATORY}" ;
+      if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then
+         if test ! -z "${TONEZONE_MANDATORY}" ;
          then
             echo " ***"
             echo " *** It appears that you do not have the tonezone development package installed."
-            echo " *** Please install it to include Zaptel support, or re-run configure"
+            echo " *** Please install it to include tonezone support, or re-run configure"
             echo " *** without explicitly specifying --with-tonezone"
             exit 1
          fi
-         ZAPTEL_LIB=""
-         ZAPTEL_INCLUDE=""
-         PBX_LIBZAPTEL=0
+         TONEZONE_LIB=""
+         TONEZONE_INCLUDE=""
+         PBX_LIBTONEZONE=0
       else
-         PBX_LIBZAPTEL=1
+         PBX_LIBTONEZONE=1
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_ZAPTEL 1
+#define HAVE_TONEZONE 1
 _ACEOF
 
       fi
-   elif test ! -z "${ZAPTEL_MANDATORY}";
+   elif test ! -z "${TONEZONE_MANDATORY}";
    then
       echo "***"
-      echo "*** The Zaptel installation on this system appears to be broken."
+      echo "*** The tonezone installation on this system appears to be broken."
       echo "*** Either correct the installation, or run configure"
       echo "*** without explicity specifying --with-tonezone"
       exit 1
@@ -16722,25 +16725,25 @@
   withval=$with_tonezone;
 case ${withval} in
      n|no)
-     USE_ZAPTEL=no
+     USE_TONEZONE=no
      ;;
      y|ye|yes)
-     ZAPTEL_MANDATORY="yes"
+     TONEZONE_MANDATORY="yes"
      ;;
      *)
-     ZAPTEL_DIR="${withval}"
-     ZAPTEL_MANDATORY="yes"
+     TONEZONE_DIR="${withval}"
+     TONEZONE_MANDATORY="yes"
      ;;
 esac
 
 fi
 
 
-PBX_LIBZAPTEL=0
-
-if test "${USE_ZAPTEL}" != "no"; then
+PBX_LIBTONEZONE=0
+
+if test "${USE_TONEZONE}" != "no"; then
    pbxlibdir=""
-   if test "x${ZAPTEL_DIR}" != "x"; then
+   if test "x${TONEZONE_DIR}" != "x"; then
       pbxlibdir="-L${tonezone_DIR}/lib"
    fi
    { echo "$as_me:$LINENO: checking for tone_zone_find in -ltonezone" >&5
@@ -16821,23 +16824,23 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
 echo "${ECHO_T}$ac_cv_lib_tonezone_tone_zone_find" >&6; }
 if test $ac_cv_lib_tonezone_tone_zone_find = yes; then
-  AST_ZAPTEL_FOUND=yes
-else
-  AST_ZAPTEL_FOUND=no
-fi
-
-
-   if test "${AST_ZAPTEL_FOUND}" = "yes"; then
-      ZAPTEL_LIB="-ltonezone -lm"
-      ZAPTEL_HEADER_FOUND="1"
-      if test "x${ZAPTEL_DIR}" != "x"; then
-         ZAPTEL_LIB="${pbxlibdir} ${ZAPTEL_LIB}"
-	 ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
-	 if test "xzaptel.h" != "x" ; then
-	    as_ac_Header=`echo "ac_cv_header_${ZAPTEL_DIR}/include/zaptel.h" | $as_tr_sh`
+  AST_TONEZONE_FOUND=yes
+else
+  AST_TONEZONE_FOUND=no
+fi
+
+
+   if test "${AST_TONEZONE_FOUND}" = "yes"; then
+      TONEZONE_LIB="-ltonezone -lm"
+      TONEZONE_HEADER_FOUND="1"
+      if test "x${TONEZONE_DIR}" != "x"; then
+         TONEZONE_LIB="${pbxlibdir} ${TONEZONE_LIB}"
+	 TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include"
+	 if test "xtonezone.h" != "x" ; then
+	    as_ac_Header=`echo "ac_cv_header_${TONEZONE_DIR}/include/tonezone.h" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/zaptel.h" >&5
-echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/zaptel.h... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/tonezone.h... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
@@ -16846,8 +16849,8 @@
 echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/zaptel.h usability" >&5
-echo $ECHO_N "checking ${ZAPTEL_DIR}/include/zaptel.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/tonezone.h usability" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/tonezone.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16855,7 +16858,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <${ZAPTEL_DIR}/include/zaptel.h>
+#include <${TONEZONE_DIR}/include/tonezone.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -16904,15 +16907,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/zaptel.h presence" >&5
-echo $ECHO_N "checking ${ZAPTEL_DIR}/include/zaptel.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/tonezone.h presence" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/tonezone.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <${ZAPTEL_DIR}/include/zaptel.h>
+#include <${TONEZONE_DIR}/include/tonezone.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -16952,30 +16955,30 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/tonezone.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/zaptel.h" >&5
-echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/zaptel.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/tonezone.h... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -16987,27 +16990,27 @@
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  ZAPTEL_HEADER_FOUND=1
-else
-  ZAPTEL_HEADER_FOUND=0
+  TONEZONE_HEADER_FOUND=1
+else
+  TONEZONE_HEADER_FOUND=0
 fi
 
 
 	 fi
       else
-	 if test "xzaptel.h" != "x" ; then
-            if test "${ac_cv_header_zaptel_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for zaptel.h" >&5
-echo $ECHO_N "checking for zaptel.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_zaptel_h+set}" = set; then
+	 if test "xtonezone.h" != "x" ; then
+            if test "${ac_cv_header_tonezone_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for tonezone.h" >&5
+echo $ECHO_N "checking for tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_tonezone_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_h" >&5
-echo "${ECHO_T}$ac_cv_header_zaptel_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_tonezone_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking zaptel.h usability" >&5
-echo $ECHO_N "checking zaptel.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking tonezone.h usability" >&5
+echo $ECHO_N "checking tonezone.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17015,7 +17018,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <zaptel.h>
+#include <tonezone.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -17064,15 +17067,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking zaptel.h presence" >&5
-echo $ECHO_N "checking zaptel.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking tonezone.h presence" >&5
+echo $ECHO_N "checking tonezone.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <zaptel.h>
+#include <tonezone.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -17112,82 +17115,205 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: zaptel.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: tonezone.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zaptel.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zaptel.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zaptel.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: zaptel.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zaptel.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: zaptel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zaptel.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: zaptel.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: tonezone.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: tonezone.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: tonezone.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: tonezone.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: tonezone.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: tonezone.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for zaptel.h" >&5
-echo $ECHO_N "checking for zaptel.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_zaptel_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for tonezone.h" >&5
+echo $ECHO_N "checking for tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_tonezone_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header_zaptel_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_h" >&5
-echo "${ECHO_T}$ac_cv_header_zaptel_h" >&6; }
-
-fi
-if test $ac_cv_header_zaptel_h = yes; then
-  ZAPTEL_HEADER_FOUND=1
-else
-  ZAPTEL_HEADER_FOUND=0
+  ac_cv_header_tonezone_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_tonezone_h" >&6; }
+
+fi
+if test $ac_cv_header_tonezone_h = yes; then
+  TONEZONE_HEADER_FOUND=1
+else
+  TONEZONE_HEADER_FOUND=0
 fi
 
 
 	 fi
       fi
-      if test "x${ZAPTEL_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${ZAPTEL_MANDATORY}" ;
+      if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then
+         if test ! -z "${TONEZONE_MANDATORY}" ;
          then
             echo " ***"
             echo " *** It appears that you do not have the tonezone development package installed."
-            echo " *** Please install it to include Zaptel support, or re-run configure"
+            echo " *** Please install it to include tonezone support, or re-run configure"
             echo " *** without explicitly specifying --with-tonezone"
             exit 1
          fi
-         ZAPTEL_LIB=""
-         ZAPTEL_INCLUDE=""
-         PBX_LIBZAPTEL=0
+         TONEZONE_LIB=""
+         TONEZONE_INCLUDE=""
+         PBX_LIBTONEZONE=0
       else
-         PBX_LIBZAPTEL=1
+         PBX_LIBTONEZONE=1
 
 cat >>confdefs.h <<_ACEOF
+#define HAVE_TONEZONE 1
+_ACEOF
+
+      fi
+   elif test ! -z "${TONEZONE_MANDATORY}";
+   then
+      echo "***"
+      echo "*** The tonezone installation on this system appears to be broken."
+      echo "*** Either correct the installation, or run configure"
+      echo "*** without explicity specifying --with-tonezone"
+      exit 1
+   fi
+fi
+
+
+
+
+fi
+
+
+# Check whether --with-zaptel was given.
+if test "${with_zaptel+set}" = set; then
+  withval=$with_zaptel;
+case ${withval} in
+     n|no)
+     USE_ZAPTEL=no
+     ;;
+     y|ye|yes)
+     ZAPTEL_MANDATORY=yes
+     ;;
+     *)
+     ZAPTEL_DIR="${withval}"
+     ZAPTEL_MANDATORY=yes
+     ;;
+esac
+
+fi
+
+
+PBX_ZAPTEL=0
+if test "${USE_ZAPTEL}" != "no"; then
+   echo -n "checking for usability of zaptel.h... "
+   if test "${PBX_OSTYPE}" = "Linux" ; then
+      zapheader=linux/zaptel.h
+   else
+      zapheader=zaptel.h
+   fi
+   saved_cppflags="${CPPFLAGS}"
+   if test "x${ZAPTEL_DIR}" != "x"; then
+      CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include"
+   fi
+   cat >conftest.$ac_ext <<_ACEOF
+
+	/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <${zapheader}>
+int
+main ()
+{
+struct zt_transcode_header test;
+  ;
+  return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  	{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+		ac_cv_zaptel_h="yes"
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+		{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+		ac_cv_zaptel_h="no"
+
+
+fi
+
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   CPPFLAGS="${saved_cppflags}"
+   if test "${ac_cv_zaptel_h}" = "yes"; then
+	if test "${ZAPTEL_DIR}" != ""; then
+	   ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
+
+	fi
+	PBX_ZAPTEL=1
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_ZAPTEL 1
 _ACEOF
 
-      fi
    elif test ! -z "${ZAPTEL_MANDATORY}";
    then
       echo "***"
       echo "*** The Zaptel installation on this system appears to be broken."
       echo "*** Either correct the installation, or run configure"
-      echo "*** without explicity specifying --with-tonezone"
+      echo "*** including --without-zaptel."
       exit 1
    fi
 fi
 
 
-
-
-fi
 
 GSM_INTERNAL="yes"
 GSM_SYSTEM="yes"
@@ -18038,9 +18164,9 @@
 case ${withval} in
      n|no)

[... 283 lines stripped ...]


More information about the svn-commits mailing list