kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move curl version test to autoconf script

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-07-15 21:39:26 +00:00
parent a077853b17
commit d99e7d4f8e
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

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

11
funcs/Makefile
View File

@@ -19,17 +19,6 @@ CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.cc,%,$(wildcard func_*.cc
SELECTED_MODS:=$(C_MODS) $(CC_MODS) 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 all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules include $(ASTTOPDIR)/Makefile.moddir_rules