From 1b84395d17cc86f90b3e7e396f6ce8dab38ddb07 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 25 Aug 2006 00:13:03 +0000 Subject: get cflags for libcurl as well as libs (patch from qwell) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41023 f38db490-d61c-443f-a65b-d21fe96a405b --- configure | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'configure') diff --git a/configure b/configure index ff13d9d49..9de6c97a5 100755 --- a/configure +++ b/configure @@ -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 -- cgit v1.2.3