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

[Freeswitch SVN]

Author: lukedashjr
Date: Mon Apr 21 18:32:19 2008
New Revision: 8150

Added:
   freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/libdingaling.pc.in
      - copied, changed from r8144, /freeswitch/branches/lukedashjr/syslibs/libs/iksemel/iksemel.pc.in
Modified:
   freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/Makefile.am
   freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/configure.in

Log:
autoconf/automake

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 18:32:19 2008
@@ -1,4 +1,8 @@
-EXTRA_DIST =
+EXTRA_DIST = libdingaling.pc.in
+
+pkgconfigdir=$(libdir)/pkgconfig
+pkgconfig_DATA = libdingaling.pc
+
 SUBDIRS = 
 AUTOMAKE_OPTS=foreign
 NAME=dingaling

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 18:32:19 2008
@@ -118,13 +118,11 @@
     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"
+PKG_CHECK_MODULES([apr_util],[apr-util-1])
+PKG_CHECK_MODULES([iksemel],[iksemel])
+new_AM_CFLAGS="$new_AM_CFLAGS $apr_CFLAGS $apr_util_CFLAGS $iksemel_CFLAGS"
+new_AM_LDFLAGS="$new_AM_LDFLAGS $apr_LIBS $apr_util_LIBS $iksemel_LIBS"
 
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
@@ -156,6 +154,9 @@
 AC_DEFINE([__LITTLE_ENDIAN],1234,[for the places where it is not defined])
 AC_DEFINE([__BIG_ENDIAN],4321,[for the places where it is not defined])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([
+Makefile
+libdingaling.pc
+])
 
 AC_OUTPUT

Copied: freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/libdingaling.pc.in (from r8144, /freeswitch/branches/lukedashjr/syslibs/libs/iksemel/iksemel.pc.in)
==============================================================================
--- /freeswitch/branches/lukedashjr/syslibs/libs/iksemel/iksemel.pc.in	(original)
+++ freeswitch/branches/lukedashjr/syslibs/libs/libdingaling/libdingaling.pc.in	Mon Apr 21 18:32:19 2008
@@ -3,8 +3,8 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: iksemel
-Description: XML parser library for Jabber
+Name: libdingaling
+Description: XMPP Jingle library
 Version: @VERSION@
-Libs: -L${libdir} -liksemel
+Libs: -L${libdir} -ldingaling
 Cflags: -I${includedir}