Move curl version test to autoconf script

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

diff --git a/configure.ac b/configure.ac
index 853bdb25faa35dcc5e30745722ea3b2374c29da7..10dd522754609b961f32644e9adc89f7f60ba03e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -879,9 +879,19 @@ PBX_CURL=0
 AC_PATH_TOOL([CURL], [curl-config], No)
 if test ! x"${CURL}" = xNo; then
 # check for version
-   CURLLIB=$(${CURL} --libs)
-   PBX_CURL=1
-   AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
+   if test $PBX_OSTYPE = "SunOS"; then
+      if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
+         CURLLIB=$(${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
+         CURLLIB=$(${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)
 AC_SUBST(CURLLIB)

diff --git a/funcs/Makefile b/funcs/Makefile
index b16355c03281a60743927290cddc33dd18687f28..7da1342362652c3ca083ffb96a36ef88ac94ea5d 100644 (file)
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -19,17 +19,6 @@ CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.cc,%,$(wildcard func_*.cc
 
 SELECTED_MODS:=$(C_MODS) $(CC_MODS)
 
-# TODO This check needs to be handled with autoconf
-ifeq ($(OSARCH),SunOS)
-  ifeq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),)
-    MODS:=$(filter-out func_curl,$(MODS))
-  endif
-else
-  ifeq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
-    MODS:=$(filter-out func_curl,$(MODS)) 
-  endif
-endif
-
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules