Author: lukedashjr Date: Mon Apr 21 18:43:31 2008 New Revision: 8151 Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_dingaling/Makefile Log: mod_dingaling now using pkg-config 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:43:31 2008 @@ -182,6 +182,10 @@ SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $apr_util_CFLAGS" SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $apr_util_LIBS" +PKG_CHECK_MODULES([iksemel],[iksemel]) +AC_SUBST(iksemel_CFLAGS) +AC_SUBST(iksemel_LIBS) + PKG_CHECK_MODULES([LIBCURL],[libcurl >= 7.13.0],[ AC_SUBST(LIBCURL_CFLAGS) AC_SUBST(LIBCURL_LIBS) @@ -189,6 +193,13 @@ AC_MSG_WARN([libcurl not found: mod_spidermonkey and mod_xml_rpc will not work.]) ]) +PKG_CHECK_MODULES([libdingaling],[libdingaling],[ +AC_SUBST(libdingaling_CFLAGS) +AC_SUBST(libdingaling_LIBS) +],[ +AC_MSG_WARN([libdingaling not found: mod_dingaling will not work.]) +]) + PKG_CHECK_MODULES([pcre],[libpcre]) SWITCH_AM_CFLAGS="$SWITCH_AM_CFLAGS $pcre_CFLAGS" SWITCH_AM_LDFLAGS="$SWITCH_AM_LDFLAGS $pcre_LIBS" Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_dingaling/Makefile ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_dingaling/Makefile (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/src/mod/endpoints/mod_dingaling/Makefile Mon Apr 21 18:43:31 2008 @@ -1,22 +1,6 @@ -BASE=../../../.. - -LOCAL_CFLAGS = `$(BASE)/libs/apr/apr-1-config --cflags --cppflags --includes` -LOCAL_CFLAGS += `$(BASE)/libs/apr-util/apu-1-config --includes` +LOCAL_CFLAGS = $(iksemel_CFLAGS) $(libdingaling_CFLAGS) +LOCAL_LDFLAGS = $(iksemel_LIBS ) $(libdingaling_LIBS ) LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` #LOCAL_CFLAGS += -w -IKS_DIR=$(BASE)/libs/iksemel -IKS_LA=$(IKS_DIR)/src/libiksemel.la -DING_DIR=$(BASE)/libs/libdingaling -LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include -LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) -LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c include $(BASE)/build/modmake.rules - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) - - - -