From 559423d973d7bcb5173671f1bac31ad663be7532 Mon Sep 17 00:00:00 2001 From: Matthew Fredrickson Date: Wed, 13 Apr 2005 15:17:41 +0000 Subject: [PATCH] Fix so that asterisk continues to build if libcurl is not present or the correct version. bug #3982. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5463 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 2f6a875dcb..5d86910884 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -57,12 +57,14 @@ APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h ]; then 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