From: Tilghman Lesher Date: Fri, 4 Jun 2010 16:33:10 +0000 (+0000) Subject: Merged revisions 267972 via svnmerge from X-Git-Tag: 1.6.2.10-rc1~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43421e5ebae5473d37f1526e4a3b0971ec8646e9;p=thirdparty%2Fasterisk.git Merged revisions 267972 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r267972 | tilghman | 2010-06-04 11:31:25 -0500 (Fri, 04 Jun 2010) | 9 lines Merged revisions 267971 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r267971 | tilghman | 2010-06-04 11:27:02 -0500 (Fri, 04 Jun 2010) | 2 lines As-fixiate the build process ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267973 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/autoconf/libcurl.m4 b/autoconf/libcurl.m4 index 07e21c2c4f..09996c7301 100644 --- 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 5dc6c3e995..8a5e0b7600 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 267787 . +# From configure.ac Revision: 267820 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6.2. # @@ -747,10 +747,6 @@ CAP_LIB CAP_INCLUDE CAP_DIR PBX_CAP -CURL_LIB -CURL_INCLUDE -CURL_DIR -PBX_CURL CURSES_LIB CURSES_INCLUDE CURSES_DIR @@ -823,7 +819,10 @@ LDAP_LIB LDAP_INCLUDE LDAP_DIR PBX_LDAP +PBX_CURL _libcurl_config +CURL_INCLUDE +CURL_LIB LIBXML2_LIB LIBXML2_INCLUDE LIBXML2_DIR @@ -1634,7 +1633,6 @@ Optional Packages: --with-asound=PATH use Advanced Linux Sound Architecture files in PATH --with-avcodec=PATH use Ffmpeg and avcodec files in PATH --with-cap=PATH use POSIX 1.e capabilities files in PATH - --with-curl=PATH use cURL files in PATH --with-curses=PATH use curses files in PATH --with-crypto=PATH use OpenSSL Cryptography files in PATH --with-dahdi=PATH use DAHDI files in PATH @@ -8393,39 +8391,6 @@ fi - CURL_DESCRIP="cURL" - CURL_OPTION="curl" - PBX_CURL=0 - -# Check whether --with-curl was given. -if test "${with_curl+set}" = set; then - withval=$with_curl; - case ${withval} in - n|no) - USE_CURL=no - # -1 is a magic value used by menuselect to know that the package - # was disabled, other than 'not found' - PBX_CURL=-1 - ;; - y|ye|yes) - ac_mandatory_list="${ac_mandatory_list} CURL" - ;; - *) - CURL_DIR="${withval}" - ac_mandatory_list="${ac_mandatory_list} CURL" - ;; - esac - -fi - - - - - - - - - CURSES_DESCRIP="curses" CURSES_OPTION="curses" PBX_CURSES=0 @@ -9058,6 +9023,7 @@ fi + # Check whether --with-libcurl was given. @@ -43637,10 +43603,6 @@ CAP_LIB!$CAP_LIB$ac_delim CAP_INCLUDE!$CAP_INCLUDE$ac_delim CAP_DIR!$CAP_DIR$ac_delim PBX_CAP!$PBX_CAP$ac_delim -CURL_LIB!$CURL_LIB$ac_delim -CURL_INCLUDE!$CURL_INCLUDE$ac_delim -CURL_DIR!$CURL_DIR$ac_delim -PBX_CURL!$PBX_CURL$ac_delim CURSES_LIB!$CURSES_LIB$ac_delim CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim CURSES_DIR!$CURSES_DIR$ac_delim @@ -43706,6 +43668,10 @@ ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim ISDNNET_DIR!$ISDNNET_DIR$ac_delim PBX_ISDNNET!$PBX_ISDNNET$ac_delim JACK_LIB!$JACK_LIB$ac_delim +JACK_INCLUDE!$JACK_INCLUDE$ac_delim +JACK_DIR!$JACK_DIR$ac_delim +PBX_JACK!$PBX_JACK$ac_delim +LDAP_LIB!$LDAP_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43747,14 +43713,13 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -JACK_INCLUDE!$JACK_INCLUDE$ac_delim -JACK_DIR!$JACK_DIR$ac_delim -PBX_JACK!$PBX_JACK$ac_delim -LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$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 LIBXML2_LIB!$LIBXML2_LIB$ac_delim LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim LIBXML2_DIR!$LIBXML2_DIR$ac_delim @@ -43844,6 +43809,7 @@ SPANDSP_LIB!$SPANDSP_LIB$ac_delim SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim SPANDSP_DIR!$SPANDSP_DIR$ac_delim PBX_SPANDSP!$PBX_SPANDSP$ac_delim +SS7_LIB!$SS7_LIB$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43885,7 +43851,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -SS7_LIB!$SS7_LIB$ac_delim SS7_INCLUDE!$SS7_INCLUDE$ac_delim SS7_DIR!$SS7_DIR$ac_delim PBX_SS7!$PBX_SS7$ac_delim @@ -43982,6 +43947,7 @@ PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim PG_CONFIG!$PG_CONFIG$ac_delim +PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -44023,7 +43989,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim PWLIBDIR!$PWLIBDIR$ac_delim PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim PWLIB_LIBDIR!$PWLIB_LIBDIR$ac_delim @@ -44049,7 +44014,7 @@ PBX_GENERIC_ODBC!$PBX_GENERIC_ODBC$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index f1502003c7..ea567ebf26 100644 --- a/configure.ac +++ b/configure.ac @@ -296,7 +296,6 @@ AC_SUBST(AST_DEVMODE) AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound]) AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec]) AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap]) -AST_EXT_LIB_SETUP([CURL], [cURL], [curl]) AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography], [crypto]) AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])