From 3eb4f927d3e14707c24388d36cbc746b321edd7e Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 12 Nov 2008 15:34:43 +0000 Subject: [PATCH] Merged revisions 156127 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r156127 | mmichelson | 2008-11-12 09:33:11 -0600 (Wed, 12 Nov 2008) | 5 lines Add a couple of AC_SUBST calls to the AST_C_COMPILE_CHECK macro. These missing calls were discovered when working on timerfd support in a separate branch. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156128 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- autoconf/ast_c_compile_check.m4 | 2 ++ configure | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4 index 0d49ec3ca7..c7125b0d56 100644 --- a/autoconf/ast_c_compile_check.m4 +++ b/autoconf/ast_c_compile_check.m4 @@ -26,6 +26,8 @@ AC_DEFUN([AST_C_COMPILE_CHECK], ], [ AC_MSG_RESULT(no) ] ) + AC_SUBST(PBX_$1) + AC_SUBST($1_INCLUDE) CPPFLAGS="${saved_cppflags}" fi ]) diff --git a/configure b/configure index 0a7722b482..d0c4145ec8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 153711 . +# From configure.ac Revision: 155117 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -965,6 +965,8 @@ AST_NO_STRICT_OVERFLOW AST_SHADOW_WARNINGS PBX_RTLD_NOLOAD PBX_IP_MTU_DISCOVER +PBX_GETIFADDRS +GETIFADDRS_INCLUDE GSM_INTERNAL PBX_MISDN_FAC_RESULT PBX_MISDN_FAC_ERROR @@ -31342,6 +31344,8 @@ echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="${saved_cppflags}" fi @@ -39795,6 +39799,8 @@ echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="${saved_cppflags}" fi @@ -51005,6 +51011,8 @@ AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim AST_SHADOW_WARNINGS!$AST_SHADOW_WARNINGS$ac_delim PBX_RTLD_NOLOAD!$PBX_RTLD_NOLOAD$ac_delim PBX_IP_MTU_DISCOVER!$PBX_IP_MTU_DISCOVER$ac_delim +PBX_GETIFADDRS!$PBX_GETIFADDRS$ac_delim +GETIFADDRS_INCLUDE!$GETIFADDRS_INCLUDE$ac_delim GSM_INTERNAL!$GSM_INTERNAL$ac_delim PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim @@ -51035,7 +51043,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5