[asterisk-commits] trunk r37678 - in /trunk: configure.ac funcs/Makefile

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sat Jul 15 16:39:26 2006
New Revision: 37678

URL: http://svn.digium.com/view/asterisk?rev=37678&view=rev
Log:
Move curl version test to autoconf script

Modified:
    trunk/configure.ac
    trunk/funcs/Makefile

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=37678&r1=37677&r2=37678&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Jul 15 16:39:26 2006
@@ -879,9 +879,19 @@
 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)

Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=37678&r1=37677&r2=37678&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Sat Jul 15 16:39:26 2006
@@ -19,17 +19,6 @@
 
 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