kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 132704 via svnmerge from

Browse Source 
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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-22 20:54:07 +00:00
parent d231a9cf7d
commit d9e31c744a
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acinclude.m4
View File

@@ -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
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"

12
configure vendored
View File

@@ -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
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,6 +39594,10 @@ fi
if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
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\"
@@ -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"

4
configure.ac
View File

@@ -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