dbus ChangeLog,1.1020,1.1021 configure.in,1.151,1.152

[Thiago J. Macieira]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
	* configure.in: Make --disable-qt actually do
          something. Patch inspired by Zack Rusin.


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1020
retrieving revision 1.1021
diff -u -d -r1.1020 -r1.1021
--- ChangeLog	4 Jun 2006 15:52:05 -0000	1.1020
+++ ChangeLog	4 Jun 2006 15:53:43 -0000	1.1021
@@ -1,5 +1,10 @@
 2006-06-04  Thiago Macieira <thiago.macieira at trolltech.com>
 
+	* configure.in: Make --disable-qt actually do
+          something. Patch inspired by Zack Rusin.
+
+2006-06-04  Thiago Macieira <thiago.macieira at trolltech.com>
+
 	* qt/: Update to Subversion r548032.
 	This includes a big reorganisation of the files inside the
 	subdir.

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- configure.in	30 Apr 2006 10:47:47 -0000	1.151
+++ configure.in	4 Jun 2006 15:53:44 -0000	1.152
@@ -997,19 +997,25 @@
     AC_MSG_RESULT([release])
 fi
 
-QT_CORE=QtCore$qt_suffix
-QT_XML=QtXml$qt_suffix
-QT_GUI=QtGui$qt_suffix
-QT_TESTLIB=QtTest$qt_suffix
-min_qt_version=4.1.3
+if test x$enable_qt = xno; then
+   have_qt=no
+   have_qt_gui=no
+   have_qtest=no
+else
+   QT_CORE=QtCore$qt_suffix
+   QT_XML=QtXml$qt_suffix
+   QT_GUI=QtGui$qt_suffix
+   QT_TESTLIB=QtTest$qt_suffix
+   min_qt_version=4.1.3
 
-AC_SUBST(QT_CORE)
-AC_SUBST(QT_XML)
+   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, 
-                  have_qt=no)
+   PKG_CHECK_MODULES([DBUS_QT], 
+                     [$QT_CORE >= $min_qt_version $QT_XML >= $min_qt_version], 
+                     have_qt=yes, 
+                     have_qt=no)
+fi
 
 dnl Check for moc too
 if test x$have_qt = xyes ; then
@@ -1400,6 +1406,8 @@
 python/Makefile
 python/examples/Makefile
 qt/Makefile
+qt/src/Makefile
+qt/tools/Makefile
 qt/examples/Makefile
 qt3/Makefile
 gcj/Makefile