As-fixiate the build process

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@267971 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/autoconf/libcurl.m4 b/autoconf/libcurl.m4
index 07e21c2c4fafea1a3955ab057a40b2e7e9045879..09996c7301b25fedfa0869d965ea66ecbcbdc67d 100644 (file)
--- a/autoconf/libcurl.m4
+++ b/autoconf/libcurl.m4
@@ -55,6 +55,7 @@ AC_DEFUN([AST_LIBCURL_CHECK_CONFIG],
   AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
   AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
   AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
+  AC_SUBST(PBX_CURL)
 
   AC_ARG_WITH(libcurl,
      AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),

diff --git a/configure b/configure
index f5bc87890b8030c11007b1cef8e967194ba9a803..c7c953cd042684bb47941120924ed3fedc82caaa 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 264248 .
+# From configure.ac Revision: 267759 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -770,6 +770,7 @@ KDE_LIB
 KDE_INCLUDE
 KDE_DIR
 PBX_KDE
+PBX_CURL
 _libcurl_config
 CURL_INCLUDE
 CURL_LIB
@@ -8292,6 +8293,7 @@ PBX_KDE=0
 
 
 
+
 
 
 # Check whether --with-libcurl was given.
@@ -33598,6 +33600,7 @@ KDE_LIB!$KDE_LIB$ac_delim
 KDE_INCLUDE!$KDE_INCLUDE$ac_delim
 KDE_DIR!$KDE_DIR$ac_delim
 PBX_KDE!$PBX_KDE$ac_delim
+PBX_CURL!$PBX_CURL$ac_delim
 _libcurl_config!$_libcurl_config$ac_delim
 CURL_INCLUDE!$CURL_INCLUDE$ac_delim
 CURL_LIB!$CURL_LIB$ac_delim
@@ -33643,7 +33646,6 @@ OPENR2_DIR!$OPENR2_DIR$ac_delim
 PBX_OPENR2!$PBX_OPENR2$ac_delim
 OSPTK_LIB!$OSPTK_LIB$ac_delim
 OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim
-OSPTK_DIR!$OSPTK_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -33685,6 +33687,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+OSPTK_DIR!$OSPTK_DIR$ac_delim
 PBX_OSPTK!$PBX_OSPTK$ac_delim
 OSS_LIB!$OSS_LIB$ac_delim
 OSS_INCLUDE!$OSS_INCLUDE$ac_delim
@@ -33781,7 +33784,6 @@ PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 PBX_WORKING_FORK!$PBX_WORKING_FORK$ac_delim
-POW_LIB!$POW_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -33823,6 +33825,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+POW_LIB!$POW_LIB$ac_delim
 GC_CFLAGS!$GC_CFLAGS$ac_delim
 GC_LDFLAGS!$GC_LDFLAGS$ac_delim
 AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim
@@ -33859,7 +33862,7 @@ GTK2_LIB!$GTK2_LIB$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5