]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 48279 via svnmerge from
authorJason Parker <jparker@digium.com>
Tue, 5 Dec 2006 20:44:12 +0000 (20:44 +0000)
committerJason Parker <jparker@digium.com>
Tue, 5 Dec 2006 20:44:12 +0000 (20:44 +0000)
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..

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48280 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure.ac

index f86d9965b08f64cb7b7d74d68e1e2a6075a1484e..ac6505a5f2e516c5759fc034122165f1874350da 100644 (file)
@@ -932,22 +932,13 @@ if test "${USE_CURL}" != "no"; then
    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])