diff options
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 21 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 874ef669c..59566d075 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -128,11 +128,15 @@ AC_DEFUN([AST_C_DEFINE_CHECK], # Check if a given expression will compile using a certain header. -# AST_C_COMPILE_CHECK([package], [expression], [header file], [version]) +# AST_C_COMPILE_CHECK([package], [expression], [header file], [version], [description]) AC_DEFUN([AST_C_COMPILE_CHECK], [ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then - AC_MSG_CHECKING([if "$2" compiles using $3]) + if test "x$5" != "x"; then + AC_MSG_CHECKING([for $5]) + else + AC_MSG_CHECKING([if "$2" compiles using $3]) + fi saved_cppflags="${CPPFLAGS}" if test "x${$1_DIR}" != "x"; then $1_INCLUDE="-I${$1_DIR}/include" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 132390 . +# From configure.ac Revision: 132643 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -31153,8 +31153,13 @@ fi if test "x${PBX_GETIFADDRS}" != "x1" -a "${USE_GETIFADDRS}" != "no"; then - { echo "$as_me:$LINENO: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5 + if test "xgetifaddrs() support" != "x"; then + { echo "$as_me:$LINENO: checking for getifaddrs() support" >&5 +echo $ECHO_N "checking for getifaddrs() support... $ECHO_C" >&6; } + else + { echo "$as_me:$LINENO: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5 echo $ECHO_N "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h... $ECHO_C" >&6; } + fi saved_cppflags="${CPPFLAGS}" if test "x${GETIFADDRS_DIR}" != "x"; then GETIFADDRS_INCLUDE="-I${GETIFADDRS_DIR}/include" @@ -39589,7 +39594,11 @@ fi if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then - { echo "$as_me:$LINENO: checking if \" + 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 @@ -39599,6 +39608,7 @@ echo $ECHO_N "checking if \" #error \"spandsp 0.0.5 or greater is required\" #endif \" compiles using spandsp/version.h... $ECHO_C" >&6; } + fi saved_cppflags="${CPPFLAGS}" if test "x${SPANDSP_DIR}" != "x"; then SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" diff --git a/configure.ac b/configure.ac index 6e9fc7b2b..0d7c306e5 100644 --- a/configure.ac +++ b/configure.ac @@ -603,7 +603,7 @@ AST_EXT_LIB_CHECK([STRTOD], [c], [strtod], [stdlib.h]) AST_EXT_LIB_CHECK([FLOOR], [m], [floor]) AST_EXT_LIB_CHECK([CEIL], [m], [ceil]) -AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h]) +AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h], , [getifaddrs() support]) GSM_INTERNAL="yes" AC_SUBST(GSM_INTERNAL) @@ -1304,7 +1304,7 @@ AST_C_COMPILE_CHECK([SPANDSP], [ #if SPANDSP_RELEASE_DATE < 20080516 #error "spandsp 0.0.5 or greater is required" #endif - ], [spandsp/version.h]) + ], [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 |