From 24b74559797d2074f10a55d64ea8e107bf2894f4 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 4 Jun 2010 16:31:25 +0000
Subject: [PATCH] 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/trunk@267972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
autoconf/libcurl.m4 | 1 +
configure | 65 +++++++++++----------------------------------
configure.ac | 1 -
3 files changed, 16 insertions(+), 51 deletions(-)
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 ad5711a1e2..11b10b5fc1 100755
--- a/configure
+++ b/configure
@@ -756,10 +756,6 @@ CAP_LIB
CAP_INCLUDE
CAP_DIR
PBX_CAP
-CURL_LIB
-CURL_INCLUDE
-CURL_DIR
-PBX_CURL
CURSES_LIB
CURSES_INCLUDE
CURSES_DIR
@@ -836,7 +832,10 @@ LDAP_LIB
LDAP_INCLUDE
LDAP_DIR
PBX_LDAP
+PBX_CURL
_libcurl_config
+CURL_INCLUDE
+CURL_LIB
LIBXML2_LIB
LIBXML2_INCLUDE
LIBXML2_DIR
@@ -1742,7 +1741,6 @@ Optional Packages:
--with-avcodec=PATH use Ffmpeg and avcodec files in PATH
--with-bluetooth=PATH use Bluetooth 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
@@ -8753,39 +8751,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
@@ -9451,6 +9416,7 @@ fi
+
# Check whether --with-libcurl was given.
@@ -52073,10 +52039,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
@@ -52133,6 +52095,10 @@ INOTIFY_LIB!$INOTIFY_LIB$ac_delim
INOTIFY_INCLUDE!$INOTIFY_INCLUDE$ac_delim
INOTIFY_DIR!$INOTIFY_DIR$ac_delim
PBX_INOTIFY!$PBX_INOTIFY$ac_delim
+IODBC_LIB!$IODBC_LIB$ac_delim
+IODBC_INCLUDE!$IODBC_INCLUDE$ac_delim
+IODBC_DIR!$IODBC_DIR$ac_delim
+PBX_IODBC!$PBX_IODBC$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52174,10 +52140,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-IODBC_LIB!$IODBC_LIB$ac_delim
-IODBC_INCLUDE!$IODBC_INCLUDE$ac_delim
-IODBC_DIR!$IODBC_DIR$ac_delim
-PBX_IODBC!$PBX_IODBC$ac_delim
ISDNNET_LIB!$ISDNNET_LIB$ac_delim
ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim
ISDNNET_DIR!$ISDNNET_DIR$ac_delim
@@ -52194,7 +52156,10 @@ 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
@@ -52271,6 +52236,7 @@ PORTAUDIO_LIB!$PORTAUDIO_LIB$ac_delim
PORTAUDIO_INCLUDE!$PORTAUDIO_INCLUDE$ac_delim
PORTAUDIO_DIR!$PORTAUDIO_DIR$ac_delim
PBX_PORTAUDIO!$PBX_PORTAUDIO$ac_delim
+PRI_LIB!$PRI_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52312,7 +52278,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-PRI_LIB!$PRI_LIB$ac_delim
PRI_INCLUDE!$PRI_INCLUDE$ac_delim
PRI_DIR!$PRI_DIR$ac_delim
PBX_PRI!$PBX_PRI$ac_delim
@@ -52409,6 +52374,7 @@ SPEEX_LIB!$SPEEX_LIB$ac_delim
SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
SPEEX_DIR!$SPEEX_DIR$ac_delim
PBX_SPEEX!$PBX_SPEEX$ac_delim
+SPEEX_PREPROCESS_LIB!$SPEEX_PREPROCESS_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52450,7 +52416,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SPEEX_PREPROCESS_LIB!$SPEEX_PREPROCESS_LIB$ac_delim
SPEEX_PREPROCESS_INCLUDE!$SPEEX_PREPROCESS_INCLUDE$ac_delim
SPEEX_PREPROCESS_DIR!$SPEEX_PREPROCESS_DIR$ac_delim
PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim
@@ -52547,6 +52512,7 @@ PG_CONFIG!$PG_CONFIG$ac_delim
PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim
PWLIBDIR!$PWLIBDIR$ac_delim
PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim
+PWLIB_LIBDIR!$PWLIB_LIBDIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52588,7 +52554,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-PWLIB_LIBDIR!$PWLIB_LIBDIR$ac_delim
PWLIB_PLATFORM!$PWLIB_PLATFORM$ac_delim
OPENH323DIR!$OPENH323DIR$ac_delim
OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
@@ -52624,7 +52589,7 @@ PBX_SYSLOG!$PBX_SYSLOG$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` = 33; 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 de8a9b099c..08fe160244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,7 +304,6 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
AST_EXT_LIB_SETUP([BLUETOOTH], [Bluetooth], [bluetooth])
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])
--
GitLab