Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 157784 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157784 | tilghman | 2008-11-19 12:28:14 -0600 (Wed, 19 Nov 2008) | 6 lines
  
  Add check for t38_terminal_init in spandsp (not found in 0.0.6, so it should fail reasonably)
  (closes issue #13473)
   Reported by: genie
   Patches: 
         20080916__bug13473.diff.txt uploaded by Corydon76 (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157785 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Tilghman Lesher 17 years ago
parent ff0b255e44
commit 603d57fc4f
2 changed files with 281 additions and 5 deletions
Show Stats Download Patch File Download Diff File

280
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 155117 .
# From configure.ac Revision: 157602 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@ -12953,11 +12953,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@ -12997,11 +12999,13 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
#include <sys/types.h> /* for off_t */
#include <stdio.h>
int
main ()
{
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
@ -40100,6 +40104,272 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
cat >>confdefs.h <<_ACEOF
#define HAVE_SPANDSP_VERSION
_ACEOF
fi
fi
fi
fi
if test "x${PBX_SPANDSP}" = "x1" ; then
# We also need t38_terminal_init()
PBX_SPANDSP=0
if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
pbxlibdir=""
# if --with-SPANDSP=DIR has been specified, use it.
if test "x${SPANDSP_DIR}" != "x"; then
if test -d ${SPANDSP_DIR}/lib; then
pbxlibdir="-L${SPANDSP_DIR}/lib"
else
pbxlibdir="-L${SPANDSP_DIR}"
fi
fi
pbxfuncname="t38_terminal_init"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_SPANDSP_FOUND=yes
else
as_ac_Lib=`echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lspandsp" >&5
echo $ECHO_N "checking for ${pbxfuncname} in -lspandsp... $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="-lspandsp ${pbxlibdir} -ltiff $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 ${pbxfuncname} ();
int
main ()
{
return ${pbxfuncname} ();
;
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
eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Lib=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
ac_res=`eval echo '${'$as_ac_Lib'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
AST_SPANDSP_FOUND=yes
else
AST_SPANDSP_FOUND=no
fi
fi
# now check for the header.
if test "${AST_SPANDSP_FOUND}" = "yes"; then
SPANDSP_LIB="${pbxlibdir} -lspandsp -ltiff"
# if --with-SPANDSP=DIR has been specified, use it.
if test "x${SPANDSP_DIR}" != "x"; then
SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include"
fi
SPANDSP_INCLUDE="${SPANDSP_INCLUDE} "
if test "xspandsp.h" = "x" ; then # no header, assume found
SPANDSP_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
if test "${ac_cv_header_spandsp_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for spandsp.h" >&5
echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; }
if test "${ac_cv_header_spandsp_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5
echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking spandsp.h usability" >&5
echo $ECHO_N "checking spandsp.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 <spandsp.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 spandsp.h presence" >&5
echo $ECHO_N "checking spandsp.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 <spandsp.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: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: spandsp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: spandsp.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: spandsp.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: spandsp.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: spandsp.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: spandsp.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: spandsp.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: spandsp.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: spandsp.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: spandsp.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: spandsp.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: spandsp.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: spandsp.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 spandsp.h" >&5
echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; }
if test "${ac_cv_header_spandsp_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_spandsp_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_spandsp_h" >&5
echo "${ECHO_T}$ac_cv_header_spandsp_h" >&6; }
fi
if test $ac_cv_header_spandsp_h = yes; then
SPANDSP_HEADER_FOUND=1
else
SPANDSP_HEADER_FOUND=0
fi
CPPFLAGS="${saved_cppflags}"
fi
if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then
SPANDSP_LIB=""
SPANDSP_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
SPANDSP_LIB=""
fi
PBX_SPANDSP=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_SPANDSP 1
_ACEOF
cat >>confdefs.h <<_ACEOF
#define HAVE_SPANDSP_VERSION
_ACEOF

6
configure.ac
Unescape View File

@ -1343,6 +1343,12 @@ if test "x${PBX_SPANDSP}" = "x1" ; then
AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
fi
if test "x${PBX_SPANDSP}" = "x1" ; then
# We also need t38_terminal_init()
PBX_SPANDSP=0
AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [t38_terminal_init], [spandsp.h], [-ltiff])
fi
AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
if test "${USE_PWLIB}" != "no"; then

Write Preview
Loading…
Cancel
Save