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

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Sep 18 16:37:25 MST 2006


Author: qwell
Date: Mon Sep 18 18:37:25 2006
New Revision: 43244

URL: http://svn.digium.com/view/asterisk?rev=43244&view=rev
Log:
This was silly.  Nowhere else do we use [ or [[

Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=43244&r1=43243&r2=43244&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Mon Sep 18 18:37:25 2006
@@ -29669,28 +29669,15 @@
 
 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 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=43244&r1=43243&r2=43244&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Sep 18 18:37:25 2006
@@ -960,20 +960,11 @@
 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
+   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.])
    fi
 fi
 AC_SUBST(PBX_CURL)



More information about the asterisk-commits mailing list