diff options
| author | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-30 10:47:47 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-30 10:47:47 +0000 |
| commit | b381dfe66a30ce54691487939e1b6087155a3a9f (patch) | |
| tree | e0a98ba22efbf43b0fe4e939d371e4e34371fa66 | |
| parent | f4185fd423a5a98878764a1b1839eb4f3750db89 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | dbus-qt4-1.pc.in | 12 |
4 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2006-04-30 Thiago Macieira <thiago.macieira@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@trolltech.com> * qt/dbusidl2cpp.cpp: There's no callAsync. Use the correct diff --git a/Makefile.am b/Makefile.am index 423ba3b..48971fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ endif if HAVE_QT QT_SUBDIR=qt + QT_PC=dbus-qt4-1.pc endif if HAVE_QT3 @@ -41,12 +42,14 @@ pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC) 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 diff --git a/configure.in b/configure.in index 115af0d..7c945d9 100644 --- a/configure.in +++ b/configure.in @@ -1003,6 +1003,9 @@ QT_GUI=QtGui$qt_suffix 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 @@ doc/Makefile 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 diff --git a/dbus-qt4-1.pc.in b/dbus-qt4-1.pc.in new file mode 100644 index 0000000..b5c4aaf --- /dev/null +++ b/dbus-qt4-1.pc.in @@ -0,0 +1,12 @@ +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 + + |