summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in30
2 files changed, 24 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b6857a..294835b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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.
This includes a big reorganisation of the files inside the
subdir.
diff --git a/configure.in b/configure.in
index 7c945d9..33144b9 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