diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 16:33:10 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 16:33:10 +0000 |
commit | 25291334a96f70c63ab1ca7fa05d85a057f795aa (patch) | |
tree | 9617e236fe07df9638d6ce4c703f2d91dbb1feca /configure | |
parent | a691813702b502e7eae0908503908a1868f1e5d2 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@267973 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 65 |
1 files changed, 15 insertions, 50 deletions
@@ -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 @@ -9060,6 +9025,7 @@ fi + # Check whether --with-libcurl was given. if test "${with_libcurl+set}" = set; then withval=$with_libcurl; _libcurl_with=$withval @@ -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 |