Merged revisions 115341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r115341 | file | 2008-05-06 10:54:15 -0300 (Tue, 06 May 2008) | 2 lines Add in missing argument. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@115342 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file
parent
6319eab542
commit
a1f4f6bb09
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 115159 .
|
||||
# From configure.ac Revision: 115328 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
|
|
@ -41755,18 +41755,18 @@ if test "x${PBX_SPEEX_PREPROCESS}" != "x1" -a "${USE_SPEEX_PREPROCESS}" != "no";
|
|||
pbxlibdir="-L${SPEEX_PREPROCESS_DIR}"
|
||||
fi
|
||||
fi
|
||||
pbxfuncname="speex/speex.h"
|
||||
pbxfuncname="speex_preprocess_ctl"
|
||||
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
|
||||
AST_SPEEX_PREPROCESS_FOUND=yes
|
||||
else
|
||||
as_ac_Lib=`echo "ac_cv_lib_speex_preprocess_ctl_${pbxfuncname}" | $as_tr_sh`
|
||||
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeex_preprocess_ctl" >&5
|
||||
echo $ECHO_N "checking for ${pbxfuncname} in -lspeex_preprocess_ctl... $ECHO_C" >&6; }
|
||||
as_ac_Lib=`echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh`
|
||||
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspeex" >&5
|
||||
echo $ECHO_N "checking for ${pbxfuncname} in -lspeex... $ECHO_C" >&6; }
|
||||
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+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
|
||||
|
|
@ -41832,29 +41832,29 @@ fi
|
|||
|
||||
# now check for the header.
|
||||
if test "${AST_SPEEX_PREPROCESS_FOUND}" = "yes"; then
|
||||
SPEEX_PREPROCESS_LIB="${pbxlibdir} -lspeex_preprocess_ctl "
|
||||
SPEEX_PREPROCESS_LIB="${pbxlibdir} -lspeex -lm"
|
||||
# if --with-SPEEX_PREPROCESS=DIR has been specified, use it.
|
||||
if test "x${SPEEX_PREPROCESS_DIR}" != "x"; then
|
||||
SPEEX_PREPROCESS_INCLUDE="-I${SPEEX_PREPROCESS_DIR}/include"
|
||||
fi
|
||||
SPEEX_PREPROCESS_INCLUDE="${SPEEX_PREPROCESS_INCLUDE} "
|
||||
if test "x-lm" = "x" ; then # no header, assume found
|
||||
if test "xspeex/speex.h" = "x" ; then # no header, assume found
|
||||
SPEEX_PREPROCESS_HEADER_FOUND="1"
|
||||
else # check for the header
|
||||
saved_cppflags="${CPPFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE} "
|
||||
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 "${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
|
||||
|
|
@ -41862,7 +41862,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"
|
||||
|
|
@ -41894,15 +41894,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
|
||||
|
|
@ -41935,25 +41935,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 ##
|
||||
|
|
@ -41962,18 +41962,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
|
||||
|
|
|
|||
|
|
@ -1315,7 +1315,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
|
||||
|
|
|
|||
Reference in New Issue