diff options
-rwxr-xr-x | configure | 158 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 80 insertions, 80 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 115257 . +# From configure.ac Revision: 115327 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -29312,13 +29312,13 @@ if test "${USE_SPEEX_PREPROCESS}" != "no"; then pbxlibdir="-L${SPEEX_PREPROCESS_DIR}" fi fi - { echo "$as_me:$LINENO: checking for speex/speex.h in -lspeex_preprocess_ctl" >&5 -echo $ECHO_N "checking for speex/speex.h in -lspeex_preprocess_ctl... $ECHO_C" >&6; } -if test "${ac_cv_lib_speex_preprocess_ctl_speex_speex_h+set}" = set; then + { echo "$as_me:$LINENO: checking for speex_preprocess_ctl in -lspeex" >&5 +echo $ECHO_N "checking for speex_preprocess_ctl in -lspeex... $ECHO_C" >&6; } +if test "${ac_cv_lib_speex_speex_preprocess_ctl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lspeex_preprocess_ctl ${pbxlibdir} $LIBS" +LIBS="-lspeex ${pbxlibdir} -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29332,11 +29332,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char speex/speex.h (); +char speex_preprocess_ctl (); int main () { -return speex/speex.h (); +return speex_preprocess_ctl (); ; return 0; } @@ -29359,21 +29359,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_speex_preprocess_ctl_speex_speex_h=yes + ac_cv_lib_speex_speex_preprocess_ctl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_speex_preprocess_ctl_speex_speex_h=no + ac_cv_lib_speex_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_speex_preprocess_ctl_speex_speex_h" >&5 -echo "${ECHO_T}$ac_cv_lib_speex_preprocess_ctl_speex_speex_h" >&6; } -if test $ac_cv_lib_speex_preprocess_ctl_speex_speex_h = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_preprocess_ctl" >&5 +echo "${ECHO_T}$ac_cv_lib_speex_speex_preprocess_ctl" >&6; } +if test $ac_cv_lib_speex_speex_preprocess_ctl = yes; then AST_SPEEX_PREPROCESS_FOUND=yes else AST_SPEEX_PREPROCESS_FOUND=no @@ -29381,18 +29381,18 @@ fi if test "${AST_SPEEX_PREPROCESS_FOUND}" = "yes"; then - SPEEX_PREPROCESS_LIB="-lspeex_preprocess_ctl " + SPEEX_PREPROCESS_LIB="-lspeex -lm" SPEEX_PREPROCESS_HEADER_FOUND="1" if test "x${SPEEX_PREPROCESS_DIR}" != "x"; then SPEEX_PREPROCESS_LIB="${pbxlibdir} ${SPEEX_PREPROCESS_LIB}" SPEEX_PREPROCESS_INCLUDE="-I${SPEEX_PREPROCESS_DIR}/include" saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I${SPEEX_PREPROCESS_DIR}/include" - if test "x-lm" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${SPEEX_PREPROCESS_DIR}/include/-lm" | $as_tr_sh` + if test "xspeex/speex.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${SPEEX_PREPROCESS_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 ${SPEEX_PREPROCESS_DIR}/include/-lm" >&5 -echo $ECHO_N "checking for ${SPEEX_PREPROCESS_DIR}/include/-lm... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h" >&5 +echo $ECHO_N "checking for ${SPEEX_PREPROCESS_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 @@ -29401,8 +29401,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'` echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${SPEEX_PREPROCESS_DIR}/include/-lm usability" >&5 -echo $ECHO_N "checking ${SPEEX_PREPROCESS_DIR}/include/-lm usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h usability" >&5 +echo $ECHO_N "checking ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29410,7 +29410,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${SPEEX_PREPROCESS_DIR}/include/-lm> +#include <${SPEEX_PREPROCESS_DIR}/include/speex/speex.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29442,15 +29442,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${SPEEX_PREPROCESS_DIR}/include/-lm presence" >&5 -echo $ECHO_N "checking ${SPEEX_PREPROCESS_DIR}/include/-lm presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h presence" >&5 +echo $ECHO_N "checking ${SPEEX_PREPROCESS_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 <${SPEEX_PREPROCESS_DIR}/include/-lm> +#include <${SPEEX_PREPROCESS_DIR}/include/speex/speex.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -29483,25 +29483,25 @@ 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_PREPROCESS_DIR}/include/-lm: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/-lm: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -29510,8 +29510,8 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for ${SPEEX_PREPROCESS_DIR}/include/-lm" >&5 -echo $ECHO_N "checking for ${SPEEX_PREPROCESS_DIR}/include/-lm... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${SPEEX_PREPROCESS_DIR}/include/speex/speex.h" >&5 +echo $ECHO_N "checking for ${SPEEX_PREPROCESS_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 @@ -29532,19 +29532,19 @@ fi fi CPPFLAGS="${saved_cppflags}" else - if test "x-lm" != "x" ; then - if test "${ac_cv_header__lm+set}" = set; then - { echo "$as_me:$LINENO: checking for -lm" >&5 -echo $ECHO_N "checking for -lm... $ECHO_C" >&6; } -if test "${ac_cv_header__lm+set}" = set; then + 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__lm" >&5 -echo "${ECHO_T}$ac_cv_header__lm" >&6; } +{ 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 -lm usability" >&5 -echo $ECHO_N "checking -lm usability... $ECHO_C" >&6; } +{ 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 @@ -29552,7 +29552,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <-lm> +#include <speex/speex.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29584,15 +29584,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking -lm presence" >&5 -echo $ECHO_N "checking -lm presence... $ECHO_C" >&6; } +{ 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 <-lm> +#include <speex/speex.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -29625,25 +29625,25 @@ 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: -lm: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: -lm: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: -lm: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: -lm: proceeding with the compiler's result" >&2;} + { 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: -lm: present but cannot be compiled" >&5 -echo "$as_me: WARNING: -lm: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: -lm: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: -lm: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: -lm: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: -lm: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: -lm: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: -lm: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: -lm: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: -lm: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: -lm: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: -lm: in the future, the compiler will take precedence" >&2;} + { 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 ## @@ -29652,18 +29652,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for -lm" >&5 -echo $ECHO_N "checking for -lm... $ECHO_C" >&6; } -if test "${ac_cv_header__lm+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 else - ac_cv_header__lm=$ac_header_preproc + ac_cv_header_speex_speex_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header__lm" >&5 -echo "${ECHO_T}$ac_cv_header__lm" >&6; } +{ 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__lm = yes; then +if test $ac_cv_header_speex_speex_h = yes; then SPEEX_PREPROCESS_HEADER_FOUND=1 else SPEEX_PREPROCESS_HEADER_FOUND=0 @@ -29677,8 +29677,8 @@ fi then { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** It appears that you do not have the speex_preprocess_ctl development package installed." >&5 -echo "$as_me: *** It appears that you do not have the speex_preprocess_ctl development package installed." >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the speex development package installed." >&5 +echo "$as_me: *** It appears that you do not have the speex development package installed." >&6;} { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support, or re-run configure" >&5 echo "$as_me: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support, or re-run configure" >&6;} { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&5 diff --git a/configure.ac b/configure.ac index 0ba6a489a..432dbbaf6 100644 --- a/configure.ac +++ b/configure.ac @@ -1270,7 +1270,7 @@ AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-n AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) # See if the main speex library contains the preprocess functions -AST_EXT_LIB_CHECK([SPEEX_PREPROCESS], [speex_preprocess_ctl], [speex/speex.h], [-lm]) +AST_EXT_LIB_CHECK([SPEEX_PREPROCESS], [speex], [speex_preprocess_ctl], [speex/speex.h], [-lm]) if test "${PBX_SPEEX_PREPROCESS}" = 1; then PBX_SPEEX_PREPROCESS=1 fi |