[Freeswitch-branches] [commit] r8148 - in freeswitch/branches/lukedashjr/syslibs/freeswitch: . build

[Freeswitch SVN]

Author: lukedashjr
Date: Mon Apr 21 18:15:26 2008
New Revision: 8148

Modified:
   freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in
   freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in

Log:
use pkg-config to get at system libcurl

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/build/modmake.rules.in	Mon Apr 21 18:15:26 2008
@@ -15,12 +15,6 @@
 CCLD = $(CC)
 CXXLD = $(CXX)
 
-LIBCURL_DEPS=@LIBCURL_DEPS@
-LIBCURL=@LIBCURL@
-LIBCURL_CPPFLAGS=@LIBCURL_CPPFLAGS@
-CURL_DIR=$(switch_srcdir)/libs/curl
-CURLLA=$(CURL_DIR)/lib/libcurl.la
-
 LIBS=$(switch_builddir)/libfreeswitch.la
 DEFS=@DEFS@
 PREFIX = @prefix@
@@ -53,9 +47,9 @@
 MAKE_OPTS = `test -n "$(VERBOSE)" || echo -s`
 RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'`
 RECURSE_SOURCEFILE=`if test -f $$modname.cpp; then echo $$modname.cpp; else echo $$modname.c; fi`
-RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi `
-RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) `
-RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) `
+RECURSE_OUR_DEPS=
+RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CFLAGS) ; $(LOCAL_INSERT_CFLAGS) `
+RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_LIBS) ; $(LOCAL_INSERT_LDFLAGS) `
 RECURSE_MAKE=modname="$(RECURSE_MODNAME)" ; \
 		sourcefile="$(RECURSE_SOURCEFILE)" ; \
 		osarch=`uname -s` ; \
@@ -96,9 +90,6 @@
 	  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 ; \

Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in	Mon Apr 21 18:15:26 2008
@@ -182,6 +182,13 @@
 SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $apr_util_CFLAGS"
 SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $apr_util_LIBS"
 
+PKG_CHECK_MODULES([LIBCURL],[libcurl >= 7.13.0],[
+AC_SUBST(LIBCURL_CFLAGS)
+AC_SUBST(LIBCURL_LIBS)
+],[
+AC_MSG_WARN([libcurl not found: mod_spidermonkey and mod_xml_rpc will not work.])
+])
+
 PKG_CHECK_MODULES([pcre],[libpcre])
 SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $pcre_CFLAGS"
 SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $pcre_LIBS"
@@ -453,9 +460,6 @@
 AC_SUBST(GETSOUNDS)
 
 
-LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include'])
-AC_SUBST(LIBCURL_DEPS)
-
 AC_ARG_ENABLE(core-odbc-support,     
 	[  --enable-core-odbc-support         Compile with ODBC Support],,[enable_core_odbc_support="no"])