2003-11-19 Havoc Pennington <hp@redhat.com>

	* NEWS: update

        * configure.in: bump version to 0.20

	* configure.in (have_qt): add yet another place to look for qt
	(someone hand trolltech a .pc file...)

diff --git a/ChangeLog b/ChangeLog
index 5711a51..a69d648 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-19  Havoc Pennington  <hp@redhat.com>
+
+       * NEWS: update
+
+        * configure.in: bump version to 0.20
+
+       * configure.in (have_qt): add yet another place to look for qt
+       (someone hand trolltech a .pc file...)
+
 2003-11-01  Havoc Pennington  <hp@redhat.com>
 
        * doc/dbus-specification.xml: add state machine docs on the auth

diff --git a/NEWS b/NEWS
index 44ef996..7ce0f2a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+D-BUS 0.20
+===
+
+This release lands some very large API changes and numerous bugfixes.
+The list of changes is too large to fully document here; please refer
+to the documentation, and message-bus-list archives.
+
 D-BUS 0.13
 ===
 

diff --git a/configure.in b/configure.in
index a2f0e12..5d08f26 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 
 AC_INIT(dbus/dbus.h)
 
-AM_INIT_AUTOMAKE(dbus, 0.13)
+AM_INIT_AUTOMAKE(dbus, 0.20)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -625,7 +625,7 @@ if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
     have_qt=yes
     DBUS_QT_CXXFLAGS="-I$QTDIR/include"
 else
-    for dir in "${prefix}/include/qt" "/usr/include/qt-3.1" "/usr/include/qt3" "/usr/include/qt" "/usr/lib/qt/include"; do
+    for dir in "${prefix}/include/qt" "/usr/include/qt-3.1" "/usr/include/qt3" "/usr/include/qt" "/usr/lib/qt/include" "/usr/lib/qt-3.1/include"; do
         if test -f "$dir/qglobal.h"; then
             have_qt=yes
             DBUS_QT_CXXFLAGS="-I$dir"