sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverting this change... had not read the commit list yet, didn't realize the code had been upgraded 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@149427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming 2008-10-15 10:16:29 +00:00
parent 87b8602128
commit 8fb0564c4d
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 147807 .
# From configure.ac Revision: 147306 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@ -205,7 +205,7 @@ if as_func_ret_failure; then
echo as_func_ret_failure succeeded.
fi
if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
if (set x; as_func_ret_success y && test x = \"\$1\" ); then
:
else
exitcode=1
@ -409,7 +409,7 @@ if as_func_ret_failure; then
echo as_func_ret_failure succeeded.
fi
if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
if (set x; as_func_ret_success y && test x = \"\$1\" ); then
:
else
exitcode=1
@ -6586,7 +6586,7 @@ else
GNU_MAKE_VERSION_MINOR=0 ;
for a in make gmake gnumake ; do
if test -z "$a" ; then continue ; fi ;
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
if (sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
GNU_MAKE=$a ;
GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
@ -39971,25 +39971,19 @@ fi
if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
if test "xcompatible version of SpanDSP" != "x"; then
{ echo "$as_me:$LINENO: checking for compatible version of SpanDSP" >&5
echo $ECHO_N "checking for compatible version of SpanDSP... $ECHO_C" >&6; }
if test "xminimum version of SpanDSP" != "x"; then
{ echo "$as_me:$LINENO: checking for minimum version of SpanDSP" >&5
echo $ECHO_N "checking for minimum version of SpanDSP... $ECHO_C" >&6; }
else
{ echo "$as_me:$LINENO: checking if \"
#if SPANDSP_RELEASE_DATE < 20080516
#error \"spandsp 0.0.5 or greater is required\"
#endif
#if SPANDSP_RELEASE_DATE >= 20081012
#error \"spandsp 0.0.6 or greater is not supported; use 0.0.5\"
#endif
\" compiles using spandsp/version.h" >&5
echo $ECHO_N "checking if \"
#if SPANDSP_RELEASE_DATE < 20080516
#error \"spandsp 0.0.5 or greater is required\"
#endif
#if SPANDSP_RELEASE_DATE >= 20081012
#error \"spandsp 0.0.6 or greater is not supported; use 0.0.5\"
#endif
\" compiles using spandsp/version.h... $ECHO_C" >&6; }
fi
saved_cppflags="${CPPFLAGS}"
@ -40012,9 +40006,6 @@ main ()
#if SPANDSP_RELEASE_DATE < 20080516
#error "spandsp 0.0.5 or greater is required"
#endif
#if SPANDSP_RELEASE_DATE >= 20081012
#error "spandsp 0.0.6 or greater is not supported; use 0.0.5"
#endif
;
;

5
configure.ac
View File

@ -1350,10 +1350,7 @@ AST_C_COMPILE_CHECK([SPANDSP], [
#if SPANDSP_RELEASE_DATE < 20080516
#error "spandsp 0.0.5 or greater is required"
#endif
#if SPANDSP_RELEASE_DATE >= 20081012
#error "spandsp 0.0.6 or greater is not supported; use 0.0.5"
#endif
], [spandsp/version.h], , [compatible version of SpanDSP])
], [spandsp/version.h], , [minimum version of SpanDSP])
if test "x${PBX_SPANDSP}" = "x1" ; then
# We found the correct version in the header, now let's make sure it links