diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-13 17:12:35 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-13 17:12:35 +0000 |
commit | b2795e18476182493cc64f079623b2ab1193a264 (patch) | |
tree | 73b1bad9908e473e6e3ca587235cd3097e24385d | |
parent | d70e24ce419474ce968ef1f50749d94f8e2338a9 (diff) |
Merged revisions 156612 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r156612 | mmichelson | 2008-11-13 11:07:56 -0600 (Thu, 13 Nov 2008) | 4 lines
Kevin sent a note indicating that this change is
not necessary, so I am reverting it
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@156614 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | autoconf/ast_c_compile_check.m4 | 2 | ||||
-rwxr-xr-x | configure | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4 index c7125b0d5..0d49ec3ca 100644 --- a/autoconf/ast_c_compile_check.m4 +++ b/autoconf/ast_c_compile_check.m4 @@ -26,8 +26,6 @@ AC_DEFUN([AST_C_COMPILE_CHECK], ], [ AC_MSG_RESULT(no) ] ) - AC_SUBST(PBX_$1) - AC_SUBST($1_INCLUDE) CPPFLAGS="${saved_cppflags}" fi ]) @@ -965,8 +965,6 @@ 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 @@ -31344,8 +31342,6 @@ echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CPPFLAGS="${saved_cppflags}" fi @@ -39799,8 +39795,6 @@ echo "${ECHO_T}no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CPPFLAGS="${saved_cppflags}" fi @@ -51011,8 +51005,6 @@ 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 @@ -51043,7 +51035,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` = 85; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |