[Asterisk-cvs] asterisk/apps Makefile,1.97,1.98

mattf at lists.digium.com mattf at lists.digium.com
Wed Apr 13 10:26:00 CDT 2005


Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv10285/apps

Modified Files:
	Makefile 
Log Message:
Fix so that asterisk continues to build if libcurl is not present or the correct
version. bug #3982.


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- Makefile	1 Apr 2005 17:00:50 -0000	1.97
+++ Makefile	13 Apr 2005 15:17:41 -0000	1.98
@@ -57,12 +57,14 @@
 APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
 
 CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
-ifneq (${CURLLIBS},)
-	APPS+=app_curl.so
-	ifeq (${OSARCH},OpenBSD)
-		CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
-	endif
-endif 
+ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
+	ifneq (${CURLLIBS},)
+		APPS+=app_curl.so
+		ifeq (${OSARCH},OpenBSD)
+			CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
+		endif
+	endif 
+endif
 CFLAGS+=-fPIC
 #
 # If you have MySQL 4.1 or later you can use ODBC




More information about the svn-commits mailing list