aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-22 20:49:41 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-22 20:49:41 +0000
commit9b4dfa46c787d5fefb0f1562c8969d3bb1e97e8b (patch)
tree1e794b827313acfdf8fe24865fde113a79b11b6b
parent8e7b6f8e003e13a153ea44d5d8522c3df5f7fe29 (diff)
make AST_C_COMPILE_CHECK able to print a 'pretty' description of what it is doing
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@132704 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--acinclude.m48
-rwxr-xr-xconfigure9
-rw-r--r--configure.ac2
3 files changed, 14 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 14271237b..c7229a2be 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -148,11 +148,15 @@ AC_DEFUN([AST_C_DEFINE_CHECK],
# AST_C_COMPILE_CHECK can be used for testing for various items in header files
-# 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"
diff --git a/configure b/configure
index e25eb25ce..cf9ba3c2f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 130039 .
+# From configure.ac Revision: 132641 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@@ -17229,8 +17229,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"
diff --git a/configure.ac b/configure.ac
index 7496ec05a..d7a1acd04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,7 +444,7 @@ if test "${USE_DAHDI}" != "no" ; then
fi
fi
-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)