From e3f0ca05e5a8934952ed2ad0437a64cb41c653d4 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 18 Sep 2006 23:59:23 +0000 Subject: This totally worked when I tested it... Reverting for now.. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43245 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 21 +++++++++++++++++---- configure.ac | 19 ++++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 0fdbf8f9c..cf5665c06 100755 --- a/configure +++ b/configure @@ -29669,15 +29669,28 @@ fi 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 diff --git a/configure.ac b/configure.ac index c5988b406..f6c066802 100644 --- a/configure.ac +++ b/configure.ac @@ -960,11 +960,20 @@ PBX_CURL=0 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) -- cgit v1.2.3