mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-15 00:41:02 +00:00
Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines another cross-compile fix ........ r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines support --without-curl in configure script ........ r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead ........ r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines missed one conversion to ASTCFLAGS ........ r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines yet another place where we were not using the correct CFLAGS by default ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
92
configure
vendored
92
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 43427 .
|
||||
# From configure.ac Revision: 43830 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.60a.
|
||||
#
|
||||
@@ -694,6 +694,9 @@ PBX_ALSA
|
||||
CAP_LIB
|
||||
CAP_INCLUDE
|
||||
PBX_CAP
|
||||
CURL_LIB
|
||||
CURL_INCLUDE
|
||||
PBX_CURL
|
||||
CURSES_LIB
|
||||
CURSES_INCLUDE
|
||||
PBX_CURSES
|
||||
@@ -832,9 +835,6 @@ PBX_GTK
|
||||
GTK_INCLUDE
|
||||
GTK_LIB
|
||||
CURL
|
||||
PBX_CURL
|
||||
CURL_INCLUDE
|
||||
CURL_LIB
|
||||
LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1429,6 +1429,7 @@ Optional Packages:
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-asound=PATH use Advanced Linux Sound Architecture 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-gnutls=PATH use GNU TLS support (used for iksemel only) files in
|
||||
PATH
|
||||
@@ -5422,6 +5423,33 @@ PBX_CAP=0
|
||||
|
||||
|
||||
|
||||
CURL_DESCRIP="cURL"
|
||||
CURL_OPTION="curl"
|
||||
|
||||
# Check whether --with-curl was given.
|
||||
if test "${with_curl+set}" = set; then
|
||||
withval=$with_curl;
|
||||
case ${withval} in
|
||||
n|no)
|
||||
USE_CURL=no
|
||||
;;
|
||||
y|ye|yes)
|
||||
CURL_MANDATORY="yes"
|
||||
;;
|
||||
*)
|
||||
CURL_DIR="${withval}"
|
||||
CURL_MANDATORY="yes"
|
||||
;;
|
||||
esac
|
||||
|
||||
fi
|
||||
|
||||
PBX_CURL=0
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
CURSES_DESCRIP="curses"
|
||||
CURSES_OPTION="curses"
|
||||
|
||||
@@ -31436,8 +31464,8 @@ fi
|
||||
|
||||
|
||||
|
||||
PBX_CURL=0
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
if test "${USE_CURL}" != "no"; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}curl-config; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
@@ -31539,36 +31567,34 @@ else
|
||||
CURL="$ac_cv_path_CURL"
|
||||
fi
|
||||
|
||||
if test ! x"${CURL}" = xNo; then
|
||||
# check for version
|
||||
if test "${host_os}" = "SunOS"; then
|
||||
if [ 0x`curl-config --vernum` -ge 0x70907 ]; then
|
||||
CURL_INCLUDE=$(${CURL} --cflags)
|
||||
CURL_LIB=$(${CURL} --libs)
|
||||
PBX_CURL=1
|
||||
if test ! x"${CURL}" = xNo; then
|
||||
# check for version
|
||||
if test "${host_os}" = "SunOS"; then
|
||||
if [ 0x`curl-config --vernum` -ge 0x70907 ]; then
|
||||
CURL_INCLUDE=$(${CURL} --cflags)
|
||||
CURL_LIB=$(${CURL} --libs)
|
||||
PBX_CURL=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_CURL 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
else
|
||||
if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
|
||||
CURL_INCLUDE=$(${CURL} --cflags)
|
||||
CURL_LIB=$(${CURL} --libs)
|
||||
PBX_CURL=1
|
||||
fi
|
||||
else
|
||||
if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
|
||||
CURL_INCLUDE=$(${CURL} --cflags)
|
||||
CURL_LIB=$(${CURL} --libs)
|
||||
PBX_CURL=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_CURL 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts channels/h323/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
@@ -32268,11 +32294,11 @@ PBX_ALSA!$PBX_ALSA$ac_delim
|
||||
CAP_LIB!$CAP_LIB$ac_delim
|
||||
CAP_INCLUDE!$CAP_INCLUDE$ac_delim
|
||||
PBX_CAP!$PBX_CAP$ac_delim
|
||||
CURL_LIB!$CURL_LIB$ac_delim
|
||||
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
|
||||
PBX_CURL!$PBX_CURL$ac_delim
|
||||
CURSES_LIB!$CURSES_LIB$ac_delim
|
||||
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
|
||||
PBX_CURSES!$PBX_CURSES$ac_delim
|
||||
GNUTLS_LIB!$GNUTLS_LIB$ac_delim
|
||||
GNUTLS_INCLUDE!$GNUTLS_INCLUDE$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -32314,6 +32340,9 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
PBX_CURSES!$PBX_CURSES$ac_delim
|
||||
GNUTLS_LIB!$GNUTLS_LIB$ac_delim
|
||||
GNUTLS_INCLUDE!$GNUTLS_INCLUDE$ac_delim
|
||||
PBX_GNUTLS!$PBX_GNUTLS$ac_delim
|
||||
GSM_LIB!$GSM_LIB$ac_delim
|
||||
GSM_INCLUDE!$GSM_INCLUDE$ac_delim
|
||||
@@ -32408,9 +32437,6 @@ PBX_TONEZONE!$PBX_TONEZONE$ac_delim
|
||||
VORBIS_LIB!$VORBIS_LIB$ac_delim
|
||||
VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim
|
||||
PBX_VORBIS!$PBX_VORBIS$ac_delim
|
||||
VPB_LIB!$VPB_LIB$ac_delim
|
||||
VPB_INCLUDE!$VPB_INCLUDE$ac_delim
|
||||
PBX_VPB!$PBX_VPB$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -32452,6 +32478,9 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
VPB_LIB!$VPB_LIB$ac_delim
|
||||
VPB_INCLUDE!$VPB_INCLUDE$ac_delim
|
||||
PBX_VPB!$PBX_VPB$ac_delim
|
||||
ZLIB_LIB!$ZLIB_LIB$ac_delim
|
||||
ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
|
||||
PBX_ZLIB!$PBX_ZLIB$ac_delim
|
||||
@@ -32488,9 +32517,6 @@ PBX_GTK!$PBX_GTK$ac_delim
|
||||
GTK_INCLUDE!$GTK_INCLUDE$ac_delim
|
||||
GTK_LIB!$GTK_LIB$ac_delim
|
||||
CURL!$CURL$ac_delim
|
||||
PBX_CURL!$PBX_CURL$ac_delim
|
||||
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
|
||||
CURL_LIB!$CURL_LIB$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user