[asterisk-commits] russell: trunk r41023 - in /trunk: configure configure.ac makeopts.in

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Aug 24 19:13:03 2006
New Revision: 41023

URL: http://svn.digium.com/view/asterisk?rev=41023&view=rev
Log:
get cflags for libcurl as well as libs (patch from qwell)

Modified:
    trunk/configure
    trunk/configure.ac
    trunk/makeopts.in

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=41023&r1=41022&r2=41023&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Aug 24 19:13:03 2006
@@ -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_LIB
 CURL
 PBX_CURL
-CURLLIB
+CURL_INCLUDE
+CURL_LIB
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -29441,7 +29442,8 @@
 # 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 @@
       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
@@ -29461,6 +29464,7 @@
       fi
    fi
 fi
+
 
 
 
@@ -30360,11 +30364,12 @@
 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

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=41023&r1=41022&r2=41023&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Aug 24 19:13:03 2006
@@ -917,20 +917,23 @@
 # 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

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?rev=41023&r1=41022&r2=41023&view=diff
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Thu Aug 24 19:13:03 2006
@@ -53,7 +53,8 @@
 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@