diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 16:52:27 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 16:52:27 +0000 |
commit | 3d98f942e249812f14e0f66535e68a4d42b39cba (patch) | |
tree | 9e05f7815665a75f4ed5d83df2d029f28b83463d | |
parent | 4c5f57204798cfd4920d92217a9ae85775c327b4 (diff) |
support --without-curl in configure script
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43997 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | configure | 92 | ||||
-rw-r--r-- | configure.ac | 43 |
2 files changed, 80 insertions, 55 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 43281 . +# From configure.ac Revision: 43410 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60a. # @@ -691,6 +691,9 @@ AST_DEVMODE ALSA_LIB ALSA_INCLUDE PBX_ALSA +CURL_LIB +CURL_INCLUDE +PBX_CURL CURSES_LIB CURSES_INCLUDE PBX_CURSES @@ -826,9 +829,6 @@ PBX_GTK GTK_INCLUDE GTK_LIB CURL -PBX_CURL -CURL_INCLUDE -CURL_LIB LTLIBOBJS' ac_subst_files='' ac_precious_vars='build_alias @@ -1422,6 +1422,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-asound=PATH use Advanced Linux Sound Architecture 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 @@ -5387,6 +5388,33 @@ PBX_ALSA=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" @@ -30428,8 +30456,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 @@ -30531,36 +30559,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 @@ -31257,14 +31283,14 @@ AST_DEVMODE!$AST_DEVMODE$ac_delim ALSA_LIB!$ALSA_LIB$ac_delim ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim PBX_ALSA!$PBX_ALSA$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 -PBX_GNUTLS!$PBX_GNUTLS$ac_delim -GSM_LIB!$GSM_LIB$ac_delim -GSM_INCLUDE!$GSM_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31306,6 +31332,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PBX_GNUTLS!$PBX_GNUTLS$ac_delim +GSM_LIB!$GSM_LIB$ac_delim +GSM_INCLUDE!$GSM_INCLUDE$ac_delim PBX_GSM!$PBX_GSM$ac_delim IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim @@ -31400,9 +31429,6 @@ PBX_VPB!$PBX_VPB$ac_delim ZLIB_LIB!$ZLIB_LIB$ac_delim ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim PBX_ZLIB!$PBX_ZLIB$ac_delim -ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim -ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim -PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31444,6 +31470,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim +ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim +PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim ALLOCA!$ALLOCA$ac_delim EGREP!$EGREP$ac_delim LIBOBJS!$LIBOBJS$ac_delim @@ -31474,9 +31503,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 diff --git a/configure.ac b/configure.ac index 3218814fe..ab2146818 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,7 @@ AC_SUBST(AST_DEVMODE) # by the --with option name, to make things easier for the users :-) AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound]) +AST_EXT_LIB_SETUP([CURL], [cURL], [curl]) AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls]) AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal']) @@ -989,29 +990,27 @@ AC_SUBST(PBX_GTK) AC_SUBST(GTK_INCLUDE) AC_SUBST(GTK_LIB) -PBX_CURL=0 -AC_PATH_TOOL([CURL], [curl-config], No) -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 - AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) - fi - else - if [[[ 0x`curl-config --vernum` -ge 0x70907 ]]]; then - CURL_INCLUDE=$(${CURL} --cflags) - CURL_LIB=$(${CURL} --libs) - PBX_CURL=1 - AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) - fi - fi +if test "${USE_CURL}" != "no"; then + AC_PATH_TOOL([CURL], [curl-config], No) + 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 + AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) + fi + else + if [[[ 0x`curl-config --vernum` -ge 0x70907 ]]]; then + CURL_INCLUDE=$(${CURL} --cflags) + CURL_LIB=$(${CURL} --libs) + PBX_CURL=1 + AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.]) + fi + fi + fi fi -AC_SUBST(PBX_CURL) -AC_SUBST(CURL_INCLUDE) -AC_SUBST(CURL_LIB) AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile]) AC_OUTPUT |