dbus ChangeLog, 1.1011, 1.1012 Makefile.am, 1.24, 1.25 configure.in, 1.150, 1.151 dbus-qt4-1.pc.in, NONE, 1.1

[Thiago J. Macieira]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv26406

Modified Files:
	ChangeLog Makefile.am configure.in 
Added Files:
	dbus-qt4-1.pc.in 
Log Message:
        * Makefile.am:
        * configure.in:
        * dbus-qt4-1.pc.in: Add a pkg-config file for libdbus-qt4-1.
	Thanks to Brad Hards for providing the patch


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1011
retrieving revision 1.1012
diff -u -d -r1.1011 -r1.1012
--- ChangeLog	29 Apr 2006 17:22:46 -0000	1.1011
+++ ChangeLog	30 Apr 2006 10:47:47 -0000	1.1012
@@ -1,3 +1,10 @@
+2006-04-30  Thiago Macieira  <thiago.macieira at trolltech.com>
+
+	* Makefile.am:
+	* configure.in:
+	* dbus-qt4-1.pc.in: Add a pkg-config file for libdbus-qt4-1.
+	Thanks to Brad Hards for providing the patch
+
 2006-04-29  Thiago Macieira  <thiago.macieira at trolltech.com>
 
 	* qt/dbusidl2cpp.cpp: There's no callAsync. Use the correct

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am	30 Sep 2005 15:20:08 -0000	1.24
+++ Makefile.am	30 Apr 2006 10:47:47 -0000	1.25
@@ -6,6 +6,7 @@
 
 if HAVE_QT
    QT_SUBDIR=qt
+   QT_PC=dbus-qt4-1.pc
 endif
 
 if HAVE_QT3
@@ -41,12 +42,14 @@
 DISTCLEANFILES = 		\
 	dbus-1.pc		\
 	$(GLIB_PC)		\
+	$(QT_PC)		\
 	$(MONO_PC)
 
 EXTRA_DIST =			\
 	HACKING			\
 	dbus-1.pc.in		\
 	dbus-glib-1.pc.in	\
+	dbus-qt4-1.pc.in	\
 	dbus-sharp.pc.in
 
 all-local: Doxyfile

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- configure.in	28 Mar 2006 19:16:35 -0000	1.150
+++ configure.in	30 Apr 2006 10:47:47 -0000	1.151
@@ -1003,6 +1003,9 @@
 QT_TESTLIB=QtTest$qt_suffix
 min_qt_version=4.1.3
 
+AC_SUBST(QT_CORE)
+AC_SUBST(QT_XML)
+
 PKG_CHECK_MODULES([DBUS_QT], 
                   [$QT_CORE >= $min_qt_version $QT_XML >= $min_qt_version], 
                   have_qt=yes, 
@@ -1419,6 +1422,7 @@
 dbus-1.pc
 dbus-glib-1.pc
 dbus-sharp.pc
+dbus-qt4-1.pc
 test/data/valid-config-files/debug-allow-all.conf
 test/data/valid-config-files/debug-allow-all-sha1.conf
 test/data/valid-service-files/debug-echo.service

--- NEW FILE: dbus-qt4-1.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: dbus-qt4-1
Description: Qt4 integration for the free desktop message bus
Version: @VERSION@
Requires: dbus-1 @QT_CORE@ @QT_XML@
Libs: -L${libdir} -ldbus-qt4-1