Require libcurl as a system dependency

This purges libcurl from our tree and requires it to be present on the
system for building and running FreeSWITCH.

FS-353

Author: traviscross

Makefile.am

@@ -123,17 +123,11 @@ libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc
 libfreeswitch_spandsp_la_CFLAGS  = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS)
 CORE_LIBS+=libfreeswitch_spandsp.la
 lib_LTLIBRARIES	         = libfreeswitch.la
-libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(AM_CFLAGS)
+libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(AM_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
-libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(PLATFORM_CORE_LIBS)
+libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(PLATFORM_CORE_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
 
-if CURL_BUILTIN
-CORE_LIBS += libs/curl/lib/libcurl.la
-else
-libfreeswitch_la_LDFLAGS += -lcurl
-endif
-
 if HAVE_LIBEDIT
 libfreeswitch_la_LIBADD += $(TINFO_LIBS)
 endif
@@ -444,13 +438,6 @@ libs/sofia-sip/libsofia-sip-ua/sdp/.libs/libsdp.a libs/sofia-sip/libsofia-sip-ua
 	@cd libs/sofia-sip && $(MAKE) SOFIA_CFLAGS="$(SWITCH_AM_CFLAGS)"
 	@$(TOUCH_TARGET)
 
-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)
-
 libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr/.update
 	@cd libs/apr && ./config.status
 	@$(TOUCH_TARGET)

acinclude.m4

@@ -14,4 +14,3 @@ m4_include([libs/apr/build/apr_common.m4])
 m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
 m4_include([libs/sofia-sip/m4/sac-openssl.m4])
 m4_include([libs/iksemel/build/libgnutls.m4])
-m4_include([build/config/libcurl.m4])

build/config/libcurl.m4

@@ -32,12 +32,6 @@ LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f
 CCLD = $(CC)
 CXXLD = $(CXX)
 
-LIBCURL_DEPS=@LIBCURL_DEPS@
-LIBCURL=@LIBCURL@
-LIBCURL_CPPFLAGS=@LIBCURL_CPPFLAGS@
-CURL_DIR=$(switch_srcdir)/libs/curl
-CURLLA=$(switch_builddir)/libs/curl/lib/libcurl.la
-
 OPENSSL_LIBS=@openssl_LIBS@
 OPENSSL_CFLAGS=@openssl_CFLAGS@
 
@@ -121,9 +115,6 @@ Makefile:
 	  echo 'include $$(BASE)/build/modmake.rules' >> Makefile ; \
 	fi ;
 
-$(CURLLA):
-	@cd $(CURL_DIR) && $(MAKE)
-
 LINK_OUTPUT_REDIR=> .libs/$(MODNAME).log || error="yes" ; \
 			if test -n "$(VERBOSE)" -o "$$error" = "yes"; then \
 			  cat .libs/$(MODNAME).log ; \

build/modmake.rules.in

@@ -1059,49 +1059,7 @@ AC_SUBST(GETG729)
 GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
 AC_SUBST(GETSOUNDS)
 
-
-LIBCURL_DEPS=
-
-AC_ARG_WITH(libcurl,
- AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
- [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
-
-AC_CACHE_CHECK([whether to use system libcurl library], [ac_cv_use_system_curl], [
-  LIBCURL_CHECK_CONFIG([yes], [7.13.0], [ac_cv_use_system_curl='yes'], [ac_cv_use_system_curl='no']) 
-])
-
-if test "$_libcurl_with" = "no" ; then
-  ac_cv_use_system_curl=no;
-fi
-if test "$_libcurl_with" = "yes" ; then
-  ac_cv_use_system_curl=yes;
-fi
-
-if test "$ac_cv_use_system_curl" = "yes" ; then
-AC_CACHE_CHECK([whether to use system libcurl library], [ac_cv_curl_usable], [
-  AC_CHECK_LIB(curl, curl_easy_setopt, [ac_cv_curl_usable="yes"], [ac_cv_curl_usable="no"])
-])
-fi
-
-if test "$ac_cv_curl_usable" != "yes" ; then
-  ac_cv_use_system_curl=no;
-fi
-
-if test "$ac_cv_use_system_curl" != "yes" ; then
- LIBCURL_DEPS='${switch_builddir}/libs/curl/lib/libcurl.la'
- LIBCURL='${switch_builddir}/libs/curl/lib/libcurl.la'
- LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include'
-else
- SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $LIBCURL"
-fi
-
-SWITCH_AM_CFLAGS="$LIBCURL_CPPFLAGS $SWITCH_AM_CFLAGS"
-SWITCH_AM_CXXFLAGS="$LIBCURL_CPPFLAGS $SWITCH_AM_CXXFLAGS"
-
-AM_CONDITIONAL([CURL_BUILTIN],[test "${ac_cv_use_system_curl}" != "yes"])
-
-AC_SUBST(LIBCURL_DEPS)
-
+PKG_CHECK_MODULES([CURL], [libcurl >= 7.26])
 PKG_CHECK_MODULES([PCRE], [libpcre >= 7.8])
 PKG_CHECK_MODULES([SPEEX], [speex >= 1.2rc1 speexdsp >= 1.2rc1])
 
@@ -1497,9 +1455,6 @@ fi
 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/iksemel])
 AC_CONFIG_SUBDIRS([libs/js/nsprpub])
 AC_CONFIG_SUBDIRS([libs/js])