From 64f04023a1e189495b0cfbb07be7a3c981e29e0e Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 30 Nov 2011 12:21:08 -0500 Subject: [PATCH] FS-2936: don't allow using system libcurl on systems that strip out Curl_setopt, we use it --- Makefile.am | 9 ++++----- configure.in | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7c912e491e..132b252581 100644 --- a/Makefile.am +++ b/Makefile.am @@ -344,10 +344,6 @@ freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la -if CURL_BUILTIN -freeswitch_LDFLAGS += libs/curl/lib/libcurl.la -endif - if HAVE_LIBEDIT freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT freeswitch_LDADD += libs/libedit/src/.libs/libedit.a @@ -440,7 +436,10 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree libs/libedit/src/.libs/libedit.a: cd libs/libedit && $(MAKE) -libs/curl/lib/libcurl.la: libs/curl +libs/curl/Makefile: + cd libs/curl && sh ./configure.gnu --prefix=$(prefix) + +libs/curl/lib/libcurl.la: libs/curl libs/curl/Makefile @cd libs/curl && $(MAKE) @$(TOUCH_TARGET) diff --git a/configure.in b/configure.in index 3fd09db8f4..ece825c729 100644 --- a/configure.in +++ b/configure.in @@ -1059,10 +1059,7 @@ AC_CONFIG_SUBDIRS([libs/pcre]) AC_CONFIG_SUBDIRS([libs/apr]) AC_CONFIG_SUBDIRS([libs/apr-util]) AC_CONFIG_SUBDIRS([libs/ilbc]) - -if test "$ac_cv_use_system_curl" != "yes" ; then - AC_CONFIG_SUBDIRS([libs/curl]) -fi +AC_CONFIG_SUBDIRS([libs/curl]) AC_CONFIG_SUBDIRS([libs/iksemel]) AC_CONFIG_SUBDIRS([libs/js/nsprpub]) AC_CONFIG_SUBDIRS([libs/js])