[Freeswitch-branches] [commit] r8147 - freeswitch/branches/lukedashjr/syslibs/libs/libdingaling

[Freeswitch SVN]

Author: lukedashjr
Date: Mon Apr 21 17:25:02 2008
New Revision: 8147

Modified:
   freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/Makefile.am
   freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/configure.in

Log:
build outside of FS tree

Modified: freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/Makefile.am
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/Makefile.am	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/Makefile.am	Mon Apr 21 17:25:02 2008
@@ -8,33 +8,18 @@
 AM_CFLAGS   = $(new_AM_CFLAGS) -I./src -I$(prefix)/include
 AM_CPPFLAGS = $(AM_CFLAGS)
 AM_LDFLAGS  = $(new_AM_LDFLAGS)
-
-AM_CFLAGS  += `../apr/apr-1-config --cflags --cppflags --includes || $(prefix)/bin/apr-1-config --cflags --cppflags --includes`
-AM_CFLAGS  += `../apr-util/apu-1-config --includes || $(prefix)/bin/apu-1-config --includes`
-AM_CFLAGS  += -I../iksemel/include
+AM_LIBADD   = $(new_AM_LIBADD)
 
 lib_LTLIBRARIES		= libdingaling.la
 libdingaling_la_SOURCES	= src/libdingaling.c src/sha1.c
 libdingaling_la_CFLAGS	= $(AM_CFLAGS)
 libdingaling_la_LDFLAGS	= $(AM_LDFLAGS)
-libdingaling_la_LIBADD  = ../iksemel/src/libiksemel.la ../apr/libapr-1.la ../apr-util/libaprutil-1.la
+libdingaling_la_LIBADD  = $(AM_LIBADD)
 library_includedir	= $(prefix)/include
 library_include_HEADERS = src/libdingaling.h
 
 $(libdingaling_la_SOURCES): $(libdingaling_la_LIBADD)
 
-../apr/libapr-1.la: ../apr ../apr/.update
-	cd ../apr && $(MAKE)
-	$(TOUCH_TARGET)
-
-../apr-util/libaprutil-1.la: ../apr-util ../apr-util/.update
-	cd ../apr-util && $(MAKE)
-	$(TOUCH_TARGET)
-
-../iksemel/src/libiksemel.la: ../iksemel ../iksemel/.update
-	cd ../iksemel && $(MAKE)
-	$(TOUCH_TARGET)
-
 dox:
 	cd docs && doxygen $(PWD)/docs/Doxygen.conf
 

Modified: freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/configure.in
==============================================================================
--- freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/configure.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/configure.in	Mon Apr 21 17:25:02 2008
@@ -118,8 +118,17 @@
     fi
 fi
 
+PKG_CHECK_MODULES([iksemel],[iksemel])
+new_AM_CFLAGS="$new_AM_CFLAGS $iksemel_CFLAGS"
+new_AM_LIBADD="$new_AM_LIBADD $iksemel_LIBS"
+
+PKG_CHECK_MODULES([apr],[apr-1])
+new_AM_CFLAGS="$new_AM_CFLAGS $apr_CFLAGS"
+new_AM_LIBADD="$new_AM_LIBADD $apr_LIBS"
+
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
+AC_SUBST(new_AM_LIBADD)
 AC_SUBST(SOLINK)
 AC_SUBST(DYNAMIC_LIB_EXTEN)
 AC_DEFINE_UNQUOTED([__inline__],[$IN_LINE],[sunpro is bad at inline])