diff options
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | makeopts.in | 3 |
3 files changed, 19 insertions, 10 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 40837 . +# From configure.ac Revision: 40949 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60. # @@ -810,7 +810,8 @@ GTK_INCLUDE GTK_LIB CURL PBX_CURL -CURLLIB +CURL_INCLUDE +CURL_LIB LTLIBOBJS' ac_subst_files='' ac_precious_vars='build_alias @@ -29441,7 +29442,8 @@ if test ! x"${CURL}" = xNo; then # check for version if test "${host_os}" = "SunOS"; then if [ 0x`curl-config --vernum` -ge 0x70907 ]; then - CURLLIB=$(${CURL} --libs) + CURL_INCLUDE=$(${CURL} --cflags) + CURL_LIB=$(${CURL} --libs) PBX_CURL=1 cat >>confdefs.h <<\_ACEOF @@ -29451,7 +29453,8 @@ _ACEOF fi else if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then - CURLLIB=$(${CURL} --libs) + CURL_INCLUDE=$(${CURL} --cflags) + CURL_LIB=$(${CURL} --libs) PBX_CURL=1 cat >>confdefs.h <<\_ACEOF @@ -29464,6 +29467,7 @@ fi + ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts" cat >confcache <<\_ACEOF @@ -30360,11 +30364,12 @@ GTK_INCLUDE!$GTK_INCLUDE$ac_delim GTK_LIB!$GTK_LIB$ac_delim CURL!$CURL$ac_delim PBX_CURL!$PBX_CURL$ac_delim -CURLLIB!$CURLLIB$ac_delim +CURL_INCLUDE!$CURL_INCLUDE$ac_delim +CURL_LIB!$CURL_LIB$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; 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 c3eacdc57..c166c081b 100644 --- a/configure.ac +++ b/configure.ac @@ -917,20 +917,23 @@ if test ! x"${CURL}" = xNo; then # check for version if test "${host_os}" = "SunOS"; then if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then - CURLLIB=$(${CURL} --libs) + 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 - CURLLIB=$(${CURL} --libs) + 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 AC_SUBST(PBX_CURL) -AC_SUBST(CURLLIB) +AC_SUBST(CURL_INCLUDE) +AC_SUBST(CURL_LIB) AC_CONFIG_FILES([build_tools/menuselect-deps makeopts]) AC_OUTPUT diff --git a/makeopts.in b/makeopts.in index eb80fc970..da986d33c 100644 --- a/makeopts.in +++ b/makeopts.in @@ -53,7 +53,8 @@ AST_DEVMODE=@AST_DEVMODE@ ASOUND_INCLUDE=@ALSA_INCLUDE@ ASOUND_LIB=@ALSA_LIB@ -CURL_LIB=@CURLLIB@ +CURL_INCLUDE=@CURL_INCLUDE@ +CURL_LIB=@CURL_LIB@ CURSES_INCLUDE=@CURSES_INCLUDE@ CURSES_LIB=@CURSES_LIB@ |