From e0c432a142b4190704122df5aaad0a1b1ff9ca6d Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 12 Nov 2008 15:33:11 +0000 Subject: [PATCH] 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/trunk@156127 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- autoconf/ast_c_compile_check.m4 | 2 ++ configure | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 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 9504eb5b5d..b27ccb2e33 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 154151 . +# From configure.ac Revision: 154875 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -974,6 +974,8 @@ AST_NO_STRICT_OVERFLOW AST_SHADOW_WARNINGS PBX_RTLD_NOLOAD PBX_IP_MTU_DISCOVER +PBX_GETIFADDRS +GETIFADDRS_INCLUDE GSM_INTERNAL CONFIG_LIBXML2 PBX_MISDN_FAC_RESULT @@ -31645,6 +31647,8 @@ echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="${saved_cppflags}" fi @@ -40834,6 +40838,8 @@ echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="${saved_cppflags}" fi @@ -52328,6 +52334,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 CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim @@ -52360,7 +52368,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` = 94; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -52379,7 +52387,7 @@ fi cat >>$CONFIG_STATUS <<_ACEOF cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -52392,8 +52400,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -52641,7 +52647,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&