Kevin sent a note indicating that this change is
not necessary, so I am reverting it git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@156612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
a22928b853
commit
fcf93eb5d6
|
@ -26,8 +26,6 @@ AC_DEFUN([AST_C_COMPILE_CHECK],
|
||||||
],
|
],
|
||||||
[ AC_MSG_RESULT(no) ]
|
[ AC_MSG_RESULT(no) ]
|
||||||
)
|
)
|
||||||
AC_SUBST(PBX_$1)
|
|
||||||
AC_SUBST($1_INCLUDE)
|
|
||||||
CPPFLAGS="${saved_cppflags}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
|
@ -974,8 +974,6 @@ AST_NO_STRICT_OVERFLOW
|
||||||
AST_SHADOW_WARNINGS
|
AST_SHADOW_WARNINGS
|
||||||
PBX_RTLD_NOLOAD
|
PBX_RTLD_NOLOAD
|
||||||
PBX_IP_MTU_DISCOVER
|
PBX_IP_MTU_DISCOVER
|
||||||
PBX_GETIFADDRS
|
|
||||||
GETIFADDRS_INCLUDE
|
|
||||||
GSM_INTERNAL
|
GSM_INTERNAL
|
||||||
CONFIG_LIBXML2
|
CONFIG_LIBXML2
|
||||||
PBX_MISDN_FAC_RESULT
|
PBX_MISDN_FAC_RESULT
|
||||||
|
@ -31647,8 +31645,6 @@ echo "${ECHO_T}no" >&6; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS="${saved_cppflags}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -40838,8 +40834,6 @@ echo "${ECHO_T}no" >&6; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS="${saved_cppflags}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -52334,8 +52328,6 @@ AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim
|
||||||
AST_SHADOW_WARNINGS!$AST_SHADOW_WARNINGS$ac_delim
|
AST_SHADOW_WARNINGS!$AST_SHADOW_WARNINGS$ac_delim
|
||||||
PBX_RTLD_NOLOAD!$PBX_RTLD_NOLOAD$ac_delim
|
PBX_RTLD_NOLOAD!$PBX_RTLD_NOLOAD$ac_delim
|
||||||
PBX_IP_MTU_DISCOVER!$PBX_IP_MTU_DISCOVER$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
|
GSM_INTERNAL!$GSM_INTERNAL$ac_delim
|
||||||
CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim
|
CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim
|
||||||
PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim
|
PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim
|
||||||
|
@ -52368,7 +52360,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
|
||||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
|
||||||
break
|
break
|
||||||
elif $ac_last_try; then
|
elif $ac_last_try; then
|
||||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||||
|
@ -52387,7 +52379,7 @@ fi
|
||||||
|
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF
|
cat >>$CONFIG_STATUS <<_ACEOF
|
||||||
cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
|
cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
|
||||||
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
|
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
||||||
_ACEOF
|
_ACEOF
|
||||||
sed '
|
sed '
|
||||||
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
||||||
|
@ -52400,6 +52392,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
||||||
' >>$CONFIG_STATUS <conf$$subs.sed
|
' >>$CONFIG_STATUS <conf$$subs.sed
|
||||||
rm -f conf$$subs.sed
|
rm -f conf$$subs.sed
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF
|
cat >>$CONFIG_STATUS <<_ACEOF
|
||||||
|
:end
|
||||||
|
s/|#_!!_#|//g
|
||||||
CEOF$ac_eof
|
CEOF$ac_eof
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
|
@ -52647,7 +52641,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
|
||||||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||||||
s&@INSTALL@&$ac_INSTALL&;t t
|
s&@INSTALL@&$ac_INSTALL&;t t
|
||||||
$ac_datarootdir_hack
|
$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" | sed 's/|#_!!_#|//g' >$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" >$tmp/out
|
||||||
|
|
||||||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||||||
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||||||
|
|
Loading…
Reference in New Issue