[asterisk-commits] qwell: trunk r43245 - in /trunk: configure configure.ac

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Mon Sep 18 18:59:23 2006
New Revision: 43245

URL: http://svn.digium.com/view/asterisk?rev=43245&view=rev
Log:
This totally worked when I tested it...

Reverting for now..

Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=43245&r1=43244&r2=43245&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Mon Sep 18 18:59:23 2006
@@ -29669,15 +29669,28 @@
 
 if test ! x"${CURL}" = xNo; then
 # check for version
-   if test 0x`curl-config --vernum` -ge 0x70907 ; then
-      CURL_INCLUDE=$(${CURL} --cflags)
-      CURL_LIB=$(${CURL} --libs)
-      PBX_CURL=1
+   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
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CURL 1
+_ACEOF
+
+      fi
    fi
 fi
 

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=43245&r1=43244&r2=43245&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Sep 18 18:59:23 2006
@@ -960,11 +960,20 @@
 AC_PATH_TOOL([CURL], [curl-config], No)
 if test ! x"${CURL}" = xNo; then
 # check for version
-   if test 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.])
+   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
 AC_SUBST(PBX_CURL)