[svn-commits] kpfleming: trunk r132705 - in /trunk: ./ acinclude.m4 configure configure.ac

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jul 22 15:54:07 2008
New Revision: 132705

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132705
Log:
Merged revisions 132704 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132704 | kpfleming | 2008-07-22 15:49:41 -0500 (Tue, 22 Jul 2008) | 2 lines

make AST_C_COMPILE_CHECK able to print a 'pretty' description of what it is doing

........

Modified:
    trunk/   (props changed)
    trunk/acinclude.m4
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk/trunk/acinclude.m4?view=diff&rev=132705&r1=132704&r2=132705
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Tue Jul 22 15:54:07 2008
@@ -128,11 +128,15 @@
 
 # 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"

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=132705&r1=132704&r2=132705
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Jul 22 15:54:07 2008
@@ -603,7 +603,7 @@
 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 @@
 		#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