[svn-commits] qwell: trunk r48280 - in /trunk: ./ configure.ac

[svn-commits at lists.digium.com]

Author: qwell
Date: Tue Dec  5 14:44:12 2006
New Revision: 48280

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48280
Log:
Merged revisions 48279 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48279 | qwell | 2006-12-05 14:42:52 -0600 (Tue, 05 Dec 2006) | 4 lines

Fix curl version number testing to be much more friendly to non-bash shells.

Issue 8508, patch by me.  This *SHOULD* be POSIX compliant now..

........

Modified:
    trunk/   (props changed)
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=48280&r1=48279&r2=48280
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Dec  5 14:44:12 2006
@@ -932,22 +932,13 @@
    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
-	fi
-    fi
+      if test $(printf "%d" 0x$(curl-config --vernum)) -ge $(printf "%d" 0x070907); 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_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])