diff options
| -rw-r--r-- | build_tools/menuselect-deps.in | 1 | ||||
| -rw-r--r-- | codecs/codec_speex.c | 1 | ||||
| -rwxr-xr-x | configure | 499 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
| -rw-r--r-- | makeopts.in | 3 |
6 files changed, 505 insertions, 5 deletions
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 5099331d4..e9eac5625 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -22,6 +22,7 @@ POPT=@PBX_POPT@ PRI=@PBX_PRI@ RADIUS=@PBX_RADIUS@ SPEEX=@PBX_SPEEX@ +SPEEXDSP=@PBX_SPEEXDSP@ SQLITE=@PBX_SQLITE@ SSL=@PBX_OPENSSL@ TONEZONE=@PBX_TONEZONE@ diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index c20ca426e..ad2f02fed 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -29,6 +29,7 @@ /*** MODULEINFO <depend>speex</depend> + <use>speexdsp</use> ***/ #include "asterisk.h" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 97734 . +# From configure.ac Revision: 98265 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -826,6 +826,10 @@ SPEEX_LIB SPEEX_INCLUDE SPEEX_DIR PBX_SPEEX +SPEEXDSP_LIB +SPEEXDSP_INCLUDE +SPEEXDSP_DIR +PBX_SPEEXDSP SQLITE_LIB SQLITE_INCLUDE SQLITE_DIR @@ -1533,6 +1537,7 @@ Optional Packages: --with-h323=PATH use OpenH323 files in PATH --with-radius=PATH use Radius Client files in PATH --with-speex=PATH use Speex files in PATH + --with-speexdsp=PATH use Speexdsp files in PATH --with-sqlite=PATH use SQLite files in PATH --with-suppserv=PATH use mISDN Supplemental Services files in PATH --with-ssl=PATH use OpenSSL files in PATH @@ -8497,6 +8502,34 @@ PBX_SPEEX=0 +SPEEXDSP_DESCRIP="Speexdsp" +SPEEXDSP_OPTION="speexdsp" + +# Check whether --with-speexdsp was given. +if test "${with_speexdsp+set}" = set; then + withval=$with_speexdsp; +case ${withval} in + n|no) + USE_SPEEXDSP=no + ;; + y|ye|yes) + SPEEXDSP_MANDATORY="yes" + ;; + *) + SPEEXDSP_DIR="${withval}" + SPEEXDSP_MANDATORY="yes" + ;; +esac + +fi + +PBX_SPEEXDSP=0 + + + + + + SQLITE_DESCRIP="SQLite" SQLITE_OPTION="sqlite" @@ -28522,6 +28555,415 @@ fi +if test "${USE_SPEEXDSP}" != "no"; then + pbxlibdir="" + if test "x${SPEEXDSP_DIR}" != "x"; then + if test -d ${SPEEXDSP_DIR}/lib; then + pbxlibdir="-L${SPEEXDSP_DIR}/lib" + else + pbxlibdir="-L${SPEEXDSP_DIR}" + fi + fi + { echo "$as_me:$LINENO: checking for speex_preprocess_ctl in -lspeexdsp" >&5 +echo $ECHO_N "checking for speex_preprocess_ctl in -lspeexdsp... $ECHO_C" >&6; } +if test "${ac_cv_lib_speexdsp_speex_preprocess_ctl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lspeexdsp ${pbxlibdir} -lm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char speex_preprocess_ctl (); +int +main () +{ +return speex_preprocess_ctl (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +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_link") 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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_speexdsp_speex_preprocess_ctl=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_speexdsp_speex_preprocess_ctl=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_speexdsp_speex_preprocess_ctl" >&5 +echo "${ECHO_T}$ac_cv_lib_speexdsp_speex_preprocess_ctl" >&6; } +if test $ac_cv_lib_speexdsp_speex_preprocess_ctl = yes; then + AST_SPEEXDSP_FOUND=yes +else + AST_SPEEXDSP_FOUND=no +fi + + + if test "${AST_SPEEXDSP_FOUND}" = "yes"; then + SPEEXDSP_LIB="-lspeexdsp -lm" + SPEEXDSP_HEADER_FOUND="1" + if test "x${SPEEXDSP_DIR}" != "x"; then + SPEEXDSP_LIB="${pbxlibdir} ${SPEEXDSP_LIB}" + SPEEXDSP_INCLUDE="-I${SPEEXDSP_DIR}/include" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${SPEEXDSP_DIR}/include" + if test "xspeex/speex.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${SPEEXDSP_DIR}/include/speex/speex.h" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ${SPEEXDSP_DIR}/include/speex/speex.h" >&5 +echo $ECHO_N "checking for ${SPEEXDSP_DIR}/include/speex/speex.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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ${SPEEXDSP_DIR}/include/speex/speex.h usability" >&5 +echo $ECHO_N "checking ${SPEEXDSP_DIR}/include/speex/speex.h usability... $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. */ +$ac_includes_default +#include <${SPEEXDSP_DIR}/include/speex/speex.h> +_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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking ${SPEEXDSP_DIR}/include/speex/speex.h presence" >&5 +echo $ECHO_N "checking ${SPEEXDSP_DIR}/include/speex/speex.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 <${SPEEXDSP_DIR}/include/speex/speex.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +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: ${SPEEXDSP_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${SPEEXDSP_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for ${SPEEXDSP_DIR}/include/speex/speex.h" >&5 +echo $ECHO_N "checking for ${SPEEXDSP_DIR}/include/speex/speex.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 + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + SPEEXDSP_HEADER_FOUND=1 +else + SPEEXDSP_HEADER_FOUND=0 +fi + + + fi + CPPFLAGS="${saved_cppflags}" + else + if test "xspeex/speex.h" != "x" ; then + if test "${ac_cv_header_speex_speex_h+set}" = set; then + { echo "$as_me:$LINENO: checking for speex/speex.h" >&5 +echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } +if test "${ac_cv_header_speex_speex_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 +echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking speex/speex.h usability" >&5 +echo $ECHO_N "checking speex/speex.h usability... $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. */ +$ac_includes_default +#include <speex/speex.h> +_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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking speex/speex.h presence" >&5 +echo $ECHO_N "checking speex/speex.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 <speex/speex.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +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: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: speex/speex.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: speex/speex.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: speex/speex.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: speex/speex.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: speex/speex.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: speex/speex.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: speex/speex.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for speex/speex.h" >&5 +echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; } +if test "${ac_cv_header_speex_speex_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_speex_speex_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_speex_speex_h" >&5 +echo "${ECHO_T}$ac_cv_header_speex_speex_h" >&6; } + +fi +if test $ac_cv_header_speex_speex_h = yes; then + SPEEXDSP_HEADER_FOUND=1 +else + SPEEXDSP_HEADER_FOUND=0 +fi + + + fi + fi + if test "x${SPEEXDSP_HEADER_FOUND}" = "x0" ; then + if test -n "${SPEEXDSP_MANDATORY}" ; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the speexdsp development package installed." >&5 +echo "$as_me: *** It appears that you do not have the speexdsp development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${SPEEXDSP_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${SPEEXDSP_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&6;} + exit 1 + fi + SPEEXDSP_LIB="" + SPEEXDSP_INCLUDE="" + PBX_SPEEXDSP=0 + else + PBX_SPEEXDSP=1 + +cat >>confdefs.h <<_ACEOF +#define HAVE_SPEEXDSP 1 +_ACEOF + + fi + elif test -n "${SPEEXDSP_MANDATORY}"; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The ${SPEEXDSP_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${SPEEXDSP_DESCRIP} installation on this system appears to be broken." >&6;} + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 +echo "$as_me: *** Either correct the installation, or run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&6;} + exit 1 + fi +fi + + + if test "${USE_SQLITE}" != "no"; then pbxlibdir="" if test "x${SQLITE_DIR}" != "x"; then @@ -34609,6 +35051,10 @@ SPEEX_LIB!$SPEEX_LIB$ac_delim SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim SPEEX_DIR!$SPEEX_DIR$ac_delim PBX_SPEEX!$PBX_SPEEX$ac_delim +SPEEXDSP_LIB!$SPEEXDSP_LIB$ac_delim +SPEEXDSP_INCLUDE!$SPEEXDSP_INCLUDE$ac_delim +SPEEXDSP_DIR!$SPEEXDSP_DIR$ac_delim +PBX_SPEEXDSP!$PBX_SPEEXDSP$ac_delim SQLITE_LIB!$SQLITE_LIB$ac_delim SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim SQLITE_DIR!$SQLITE_DIR$ac_delim @@ -34690,12 +35136,53 @@ GTK_LIB!$GTK_LIB$ac_delim PKGCONFIG!$PKGCONFIG$ac_delim PBX_GTK2!$PBX_GTK2$ac_delim GTK2_INCLUDE!$GTK2_INCLUDE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF GTK2_LIB!$GTK2_LIB$ac_delim CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -34713,8 +35200,8 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -34727,6 +35214,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS <conf$$subs.sed rm -f conf$$subs.sed cat >>$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -34974,7 +35463,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && diff --git a/configure.ac b/configure.ac index 1c167ff07..e209c8a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -199,6 +199,7 @@ AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) +AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv]) AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL], [ssl]) @@ -879,6 +880,8 @@ AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-n AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) +AST_EXT_LIB_CHECK([SPEEXDSP], [speexdsp], [speex_preprocess_ctl], [speex/speex.h], [-lm]) + AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h]) AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h], [-lcrypto]) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 3906df6b3..bc566902c 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -329,6 +329,9 @@ /* Define to indicate the ${SPEEX_DESCRIP} library */ #undef HAVE_SPEEX +/* Define to indicate the ${SPEEXDSP_DESCRIP} library */ +#undef HAVE_SPEEXDSP + /* Define to indicate the ${SQLITE_DESCRIP} library */ #undef HAVE_SQLITE diff --git a/makeopts.in b/makeopts.in index bfd0c39e6..88a414f4d 100644 --- a/makeopts.in +++ b/makeopts.in @@ -140,6 +140,9 @@ RADIUS_LIB=@RADIUS_LIB@ SPEEX_INCLUDE=@SPEEX_INCLUDE@ SPEEX_LIB=@SPEEX_LIB@ +SPEEXDSP_INCLUDE=@SPEEXDSP_INCLUDE@ +SPEEXDSP_LIB=@SPEEXDSP_LIB@ + SQLITE_INCLUDE=@SQLITE_INCLUDE@ SQLITE_LIB=@SQLITE_LIB@ |