[Telepathy-commits] [telepathy-qt4/master] configure.ac: check for QtGui, but don't fail if it's not present
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Dec 2 03:09:05 PST 2008
The tests for the prototype library use it, but it's not required for
any of the library code.
---
configure.ac | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index d86aae9..a6105d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,6 @@ AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
dnl Check for QtCore
PKG_CHECK_MODULES(QTCORE, [QtCore >= 4.5])
-
AC_SUBST(QTCORE_CFLAGS)
AC_SUBST(QTCORE_LIBS)
@@ -127,13 +126,18 @@ AC_SUBST(MOC)
dnl Check for QtDBus
PKG_CHECK_MODULES(QTDBUS, [QtDBus >= 4.5])
-
AC_SUBST(QTDBUS_CFLAGS)
AC_SUBST(QTDBUS_LIBS)
+dnl Check for QtGui
+have_qt_gui=
+PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.5], [have_qt_gui=yes], [have_qt_gui=no])
+AC_SUBST(QTGUI_CFLAGS)
+AC_SUBST(QTGUI_LIBS)
+AM_CONDITIONAL([HAVE_QTGUI], [test yes = "$have_qt_gui"])
+
dnl Check for QtTest
PKG_CHECK_MODULES(QTTEST, [QtTest >= 4.5])
-
AC_SUBST(QTTEST_CFLAGS)
AC_SUBST(QTTEST_LIBS)
--
1.5.6.5
More information about the Telepathy-commits
mailing list