diff options
-rw-r--r-- | apps/app_flash.c | 2 | ||||
-rw-r--r-- | apps/app_meetme.c | 2 | ||||
-rw-r--r-- | apps/app_rpt.c | 4 | ||||
-rw-r--r-- | apps/app_zapbarge.c | 2 | ||||
-rw-r--r-- | apps/app_zapras.c | 2 | ||||
-rw-r--r-- | apps/app_zapscan.c | 2 | ||||
-rw-r--r-- | channel.c | 2 | ||||
-rw-r--r-- | channels/chan_iax2.c | 2 | ||||
-rw-r--r-- | channels/chan_zap.c | 4 | ||||
-rw-r--r-- | codecs/codec_zap.c | 2 | ||||
-rwxr-xr-x | configure | 260 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | res/res_musiconhold.c | 2 |
13 files changed, 146 insertions, 146 deletions
diff --git a/apps/app_flash.c b/apps/app_flash.c index a49505210..d237fbc06 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ed0850792..226d8fe12 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 506683b31..c724c86db 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -222,8 +222,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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> diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 2381509bb..843e6151a 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -45,7 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 8511c4ea5..1e57c74bd 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <errno.h> #include <stdio.h> #include <fcntl.h> -#include <zaptel.h> +#include <zaptel/zaptel.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index 7697f11b1..d0a017072 100644 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -44,7 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" @@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #ifdef HAVE_ZAPTEL #include <sys/ioctl.h> -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #include "asterisk/pbx.h" diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index db8eb4aa1..7eb15dfe6 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -60,7 +60,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #ifdef HAVE_ZAPTEL #include <sys/ioctl.h> -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #include "asterisk/lock.h" diff --git a/channels/chan_zap.c b/channels/chan_zap.c index e2d96b129..2a6271ebd 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -62,10 +62,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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> diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c index e7ece201d..ee9b94a4a 100644 --- a/codecs/codec_zap.c +++ b/codecs/codec_zap.c @@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" @@ -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 @@ fi 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 @@ ac_res=`eval echo '${'$as_ac_Header'}'` 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 confdefs.h >>conftest.$ac_ext 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 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # 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 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 confdefs.h >>conftest.$ac_ext 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 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # 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 + ac_cv_header_zaptel_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; } +{ 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_tonezone_h = yes; then +if test $ac_cv_header_zaptel_tonezone_h = yes; then TONEZONE_HEADER_FOUND=1 else TONEZONE_HEADER_FOUND=0 @@ -17437,11 +17437,11 @@ fi 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 @@ ac_res=`eval echo '${'$as_ac_Header'}'` 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 confdefs.h >>conftest.$ac_ext 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 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # 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 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 confdefs.h >>conftest.$ac_ext 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 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # 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 + ac_cv_header_zaptel_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; } +{ 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_tonezone_h = yes; then +if test $ac_cv_header_zaptel_tonezone_h = yes; then TONEZONE_HEADER_FOUND=1 else TONEZONE_HEADER_FOUND=0 @@ -18911,7 +18911,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <zaptel.h> +#include <zaptel/zaptel.h> int main () { diff --git a/configure.ac b/configure.ac index 237a137c9..97ae1d07b 100644 --- a/configure.ac +++ b/configure.ac @@ -655,9 +655,9 @@ AST_EXT_LIB([termcap], [tgetent], [], [TERMCAP], [Termcap]) 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 @@ if test "${USE_ZAPTEL}" != "no"; then AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( - [#include <zaptel.h>], + [#include <zaptel/zaptel.h>], [struct zt_transcode_header test;]) ], [ AC_MSG_RESULT(yes) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 379f33c4e..f2d5222ad 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -50,7 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #ifdef HAVE_ZAPTEL -#include <zaptel.h> +#include <zaptel/zaptel.h> #endif #include "asterisk/lock.h" |