From: Thiago Macieira <thiago@kde.org>
Date: Sun, 4 Jun 2006 15:53:44 +0000 (+0000)
Subject: 	* configure.in: Make --disable-qt actually do
X-Git-Tag: dbus-0.62~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da04480e7e4cdf2da8a36210e1286f22f595eac8;p=thirdparty%2Fdbus.git

	* configure.in: Make --disable-qt actually do
          something. Patch inspired by Zack Rusin.
---

diff --git a/ChangeLog b/ChangeLog
index 7b6857aee..294835bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Thiago Macieira <thiago.macieira@trolltech.com>
+
+	* configure.in: Make --disable-qt actually do
+          something. Patch inspired by Zack Rusin.
+
 2006-06-04  Thiago Macieira <thiago.macieira@trolltech.com>
 
 	* qt/: Update to Subversion r548032.
diff --git a/configure.in b/configure.in
index 7c945d974..33144b9ae 100644
--- a/configure.in
+++ b/configure.in
@@ -997,19 +997,25 @@ else
     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 @@ glib/examples/statemachine/Makefile
 python/Makefile
 python/examples/Makefile
 qt/Makefile
+qt/src/Makefile
+qt/tools/Makefile
 qt/examples/Makefile
 qt3/Makefile
 gcj/Makefile