[svn-commits] kpfleming: branch 1.6.0 r132706 - /branches/1.6.0/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jul 22 15:54:57 2008
New Revision: 132706

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

................
r132705 | kpfleming | 2008-07-22 15:54:07 -0500 (Tue, 22 Jul 2008) | 10 lines

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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/configure
    branches/1.6.0/configure.ac

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/acinclude.m4?view=diff&rev=132706&r1=132705&r2=132706
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Tue Jul 22 15:54:57 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: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=132706&r1=132705&r2=132706
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Tue Jul 22 15:54:57 2008
@@ -600,7 +600,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)
@@ -1301,7 +1301,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