From 3334bdebb702429a600b152d9b87db3c70a3e106 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 18 Sep 2006 23:37:25 +0000
Subject: [PATCH] This was silly. Nowhere else do we use [ or [[
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
configure | 21 ++++-----------------
configure.ac | 19 +++++--------------
2 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/configure b/configure
index cf5665c06d..0fdbf8f9cb 100755
--- a/configure
+++ b/configure
@@ -29669,28 +29669,15 @@ fi
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
diff --git a/configure.ac b/configure.ac
index f6c066802a..c5988b406d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -960,20 +960,11 @@ PBX_CURL=0
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)
--
GitLab