FS-2936: don't allow using system libcurl on systems that strip out Curl_setopt,...

diff --git a/Makefile.am b/Makefile.am
index 7c912e491eee63b30c3f314c30337fc1f1679574..132b252581777aa91279f29ee2cbf65ef4821dab 100644 (file)
--- 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 3fd09db8f4f1727255ecec4f4e50a5f0a2fd357a..ece825c7293102874b61c6bbb8a02dddf29f13f0 100644 (file)
--- 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])