fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 03:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.in: Make --disable-qt actually do

Browse source 
something. Patch inspired by Zack Rusin.
This commit is contained in:
Thiago Macieira 2006-06-04 15:53:44 +00:00
parent edbf2bfc10
commit da04480e7e
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2006-06-04 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/: Update to Subversion r548032. * qt/: Update to Subversion r548032.

30
configure.in
View file

@ -997,19 +997,25 @@ else
AC_MSG_RESULT([release]) AC_MSG_RESULT([release])
fi fi
QT_CORE=QtCore$qt_suffix if test x$enable_qt = xno; then
QT_XML=QtXml$qt_suffix have_qt=no
QT_GUI=QtGui$qt_suffix have_qt_gui=no
QT_TESTLIB=QtTest$qt_suffix have_qtest=no
min_qt_version=4.1.3 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_CORE)
AC_SUBST(QT_XML) AC_SUBST(QT_XML)
PKG_CHECK_MODULES([DBUS_QT], PKG_CHECK_MODULES([DBUS_QT],
[$QT_CORE >= $min_qt_version $QT_XML >= $min_qt_version], [$QT_CORE >= $min_qt_version $QT_XML >= $min_qt_version],
have_qt=yes, have_qt=yes,
have_qt=no) have_qt=no)
fi
dnl Check for moc too dnl Check for moc too
if test x$have_qt = xyes ; then if test x$have_qt = xyes ; then
@ -1400,6 +1406,8 @@ glib/examples/statemachine/Makefile
python/Makefile python/Makefile
python/examples/Makefile python/examples/Makefile
qt/Makefile qt/Makefile
qt/src/Makefile
qt/tools/Makefile
qt/examples/Makefile qt/examples/Makefile
qt3/Makefile qt3/Makefile
gcj/Makefile gcj/Makefile