[asterisk-commits] trunk r37027 - in /trunk: ./ apps/ channels/
codecs/ res/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Jul 5 09:44:41 MST 2006
Author: kpfleming
Date: Wed Jul 5 11:44:41 2006
New Revision: 37027
URL: http://svn.digium.com/view/asterisk?rev=37027&view=rev
Log:
prepare Asterisk for new zaptel.h/tonezone.h installation locations
Modified:
trunk/apps/app_flash.c
trunk/apps/app_meetme.c
trunk/apps/app_rpt.c
trunk/apps/app_zapbarge.c
trunk/apps/app_zapras.c
trunk/apps/app_zapscan.c
trunk/channel.c
trunk/channels/chan_iax2.c
trunk/channels/chan_zap.c
trunk/codecs/codec_zap.c
trunk/configure
trunk/configure.ac
trunk/res/res_musiconhold.c
Modified: trunk/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_flash.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/apps/app_flash.c (original)
+++ trunk/apps/app_flash.c Wed Jul 5 11:44:41 2006
@@ -38,7 +38,7 @@
#include <string.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Jul 5 11:44:41 2006
@@ -39,7 +39,7 @@
#include <unistd.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: trunk/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_rpt.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Wed Jul 5 11:44:41 2006
@@ -222,8 +222,8 @@
#include <sys/ioctl.h>
#include <sys/io.h>
#include <math.h>
-#include <zaptel.h>
-#include <tonezone.h>
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
#include <netinet/in.h>
#include <arpa/inet.h>
Modified: trunk/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_zapbarge.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/apps/app_zapbarge.c (original)
+++ trunk/apps/app_zapbarge.c Wed Jul 5 11:44:41 2006
@@ -45,7 +45,7 @@
#include <unistd.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: trunk/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_zapras.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/apps/app_zapras.c (original)
+++ trunk/apps/app_zapras.c Wed Jul 5 11:44:41 2006
@@ -48,7 +48,7 @@
#include <errno.h>
#include <stdio.h>
#include <fcntl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: trunk/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_zapscan.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/apps/app_zapscan.c (original)
+++ trunk/apps/app_zapscan.c Wed Jul 5 11:44:41 2006
@@ -44,7 +44,7 @@
#include <unistd.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Wed Jul 5 11:44:41 2006
@@ -38,7 +38,7 @@
#ifdef HAVE_ZAPTEL
#include <sys/ioctl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#include "asterisk/pbx.h"
Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Wed Jul 5 11:44:41 2006
@@ -60,7 +60,7 @@
#ifdef HAVE_ZAPTEL
#include <sys/ioctl.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#include "asterisk/lock.h"
Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Jul 5 11:44:41 2006
@@ -62,10 +62,10 @@
#endif
#include <unistd.h>
#include <sys/ioctl.h>
-#include <zaptel.h>
#include <math.h>
-#include <tonezone.h>
#include <ctype.h>
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
#ifdef HAVE_LIBPRI
#include <libpri.h>
Modified: trunk/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_zap.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/codecs/codec_zap.c (original)
+++ trunk/codecs/codec_zap.c Wed Jul 5 11:44:41 2006
@@ -43,7 +43,7 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <sys/mman.h>
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/translate.h"
Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jul 5 11:44:41 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 36409 .
+# From configure.ac Revision: 36960 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e.
#
@@ -16964,11 +16964,11 @@
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 test "xzaptel/tonezone.h" != "x" ; then
+ as_ac_Header=`echo "ac_cv_header_${TONEZONE_DIR}/include/zaptel/tonezone.h" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { 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; }
+ { echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/zaptel/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
@@ -16977,8 +16977,8 @@
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ 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; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/zaptel/tonezone.h usability" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/zaptel/tonezone.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -16986,7 +16986,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${TONEZONE_DIR}/include/tonezone.h>
+#include <${TONEZONE_DIR}/include/zaptel/tonezone.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -17035,15 +17035,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ 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; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/zaptel/tonezone.h presence" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/zaptel/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 <${TONEZONE_DIR}/include/tonezone.h>
+#include <${TONEZONE_DIR}/include/zaptel/tonezone.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -17083,30 +17083,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: ${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;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { 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;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ 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; }
+{ echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/zaptel/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
@@ -17126,19 +17126,19 @@
fi
else
- 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
+ if test "xzaptel/tonezone.h" != "x" ; then
+ if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for zaptel/tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_tonezone_h" >&5
-echo "${ECHO_T}$ac_cv_header_tonezone_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_zaptel_tonezone_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking tonezone.h usability" >&5
-echo $ECHO_N "checking tonezone.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking zaptel/tonezone.h usability" >&5
+echo $ECHO_N "checking zaptel/tonezone.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17146,7 +17146,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <tonezone.h>
+#include <zaptel/tonezone.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -17195,15 +17195,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking tonezone.h presence" >&5
-echo $ECHO_N "checking tonezone.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking zaptel/tonezone.h presence" >&5
+echo $ECHO_N "checking zaptel/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 <tonezone.h>
+#include <zaptel/tonezone.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -17243,40 +17243,40 @@
# 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: 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;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { 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;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ 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 "$as_me:$LINENO: checking for zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for zaptel/tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- 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
+ ac_cv_header_zaptel_tonezone_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_zaptel_tonezone_h" >&6; }
+
+fi
+if test $ac_cv_header_zaptel_tonezone_h = yes; then
TONEZONE_HEADER_FOUND=1
else
TONEZONE_HEADER_FOUND=0
@@ -17437,11 +17437,11 @@
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 test "xzaptel/tonezone.h" != "x" ; then
+ as_ac_Header=`echo "ac_cv_header_${TONEZONE_DIR}/include/zaptel/tonezone.h" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { 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; }
+ { echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/zaptel/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
@@ -17450,8 +17450,8 @@
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
-{ 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; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/zaptel/tonezone.h usability" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/zaptel/tonezone.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17459,7 +17459,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${TONEZONE_DIR}/include/tonezone.h>
+#include <${TONEZONE_DIR}/include/zaptel/tonezone.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -17508,15 +17508,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ 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; }
+{ echo "$as_me:$LINENO: checking ${TONEZONE_DIR}/include/zaptel/tonezone.h presence" >&5
+echo $ECHO_N "checking ${TONEZONE_DIR}/include/zaptel/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 <${TONEZONE_DIR}/include/tonezone.h>
+#include <${TONEZONE_DIR}/include/zaptel/tonezone.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -17556,30 +17556,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: ${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;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { 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;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${TONEZONE_DIR}/include/zaptel/tonezone.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ 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; }
+{ echo "$as_me:$LINENO: checking for ${TONEZONE_DIR}/include/zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for ${TONEZONE_DIR}/include/zaptel/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
@@ -17599,19 +17599,19 @@
fi
else
- 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
+ if test "xzaptel/tonezone.h" != "x" ; then
+ if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for zaptel/tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_tonezone_h" >&5
-echo "${ECHO_T}$ac_cv_header_tonezone_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_zaptel_tonezone_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking tonezone.h usability" >&5
-echo $ECHO_N "checking tonezone.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking zaptel/tonezone.h usability" >&5
+echo $ECHO_N "checking zaptel/tonezone.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -17619,7 +17619,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <tonezone.h>
+#include <zaptel/tonezone.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -17668,15 +17668,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking tonezone.h presence" >&5
-echo $ECHO_N "checking tonezone.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking zaptel/tonezone.h presence" >&5
+echo $ECHO_N "checking zaptel/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 <tonezone.h>
+#include <zaptel/tonezone.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -17716,40 +17716,40 @@
# 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: 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;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { 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;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: zaptel/tonezone.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: zaptel/tonezone.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ 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 "$as_me:$LINENO: checking for zaptel/tonezone.h" >&5
+echo $ECHO_N "checking for zaptel/tonezone.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_zaptel_tonezone_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- 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
+ ac_cv_header_zaptel_tonezone_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_zaptel_tonezone_h" >&5
+echo "${ECHO_T}$ac_cv_header_zaptel_tonezone_h" >&6; }
+
+fi
+if test $ac_cv_header_zaptel_tonezone_h = yes; then
TONEZONE_HEADER_FOUND=1
else
TONEZONE_HEADER_FOUND=0
@@ -18911,7 +18911,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
int
main ()
{
Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jul 5 11:44:41 2006
@@ -655,9 +655,9 @@
AST_EXT_LIB([tinfo], [tgetent], [], [TINFO], [Term Info])
if test "${PBX_OSTYPE}" = "Linux" ; then
- AST_EXT_LIB([tonezone], [tone_zone_find], [tonezone.h], [TONEZONE], [tonezone])
+ AST_EXT_LIB([tonezone], [tone_zone_find], [zaptel/tonezone.h], [TONEZONE], [tonezone])
else
- AST_EXT_LIB([tonezone], [tone_zone_find], [tonezone.h], [TONEZONE], [tonezone], [-lm])
+ AST_EXT_LIB([tonezone], [tone_zone_find], [zaptel/tonezone.h], [TONEZONE], [tonezone], [-lm])
fi
AST_EXT_LIB([vorbis], [vorbis_info_init], [vorbis/codec.h], [VORBIS], [Vorbis], [-lm -lvorbisenc])
@@ -753,7 +753,7 @@
AC_COMPILE_IFELSE(
[
AC_LANG_PROGRAM(
- [#include <zaptel.h>],
+ [#include <zaptel/zaptel.h>],
[struct zt_transcode_header test;])
],
[ AC_MSG_RESULT(yes)
Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?rev=37027&r1=37026&r2=37027&view=diff
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Wed Jul 5 11:44:41 2006
@@ -50,7 +50,7 @@
#include <sys/ioctl.h>
#ifdef HAVE_ZAPTEL
-#include <zaptel.h>
+#include <zaptel/zaptel.h>
#endif
#include "asterisk/lock.h"
More information about the asterisk-commits
mailing list