summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Fernengel <harry@kdevelop.org>2006-01-22 19:42:00 +0000
committerHarald Fernengel <harry@kdevelop.org>2006-01-22 19:42:00 +0000
commit52d4364f90f00654c171956d32b0664c41a886bf (patch)
treea30707f47075c43d3f45ae1327581123c64a91d1
parent78245816603b8f03331f892cd87922e9d2b9b5cb (diff)
allow linking to debug Qt libraries, use QTestLib >= 4.1
-rw-r--r--configure.in41
1 files changed, 29 insertions, 12 deletions
diff --git a/configure.in b/configure.in
index acae00be..9d41042f 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,7 @@ AC_ISC_POSIX
AC_HEADER_STDC
AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto)
+AC_ARG_ENABLE(qt-debug, [ --enable-qt-debug enable Qt-friendly client library, linked to debug Qt libraries],enable_qt_debug=$enableval,enable_qt_debug=no)
AC_ARG_ENABLE(qt3, [ --enable-qt3 enable Qt3-friendly client library],enable_qt3=$enableval,enable_qt3=no)
AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto)
AC_ARG_ENABLE(gtk, [ --enable-gtk enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto)
@@ -976,23 +977,38 @@ AC_SUBST(DBUS_QT3_LIBS)
dnl Qt detection
-PKG_CHECK_MODULES(DBUS_QT, QtCore >= 4.0, have_qt=yes, have_qt=no)
-if test x$have_qt = xno ; then
- AC_MSG_WARN([Qt development libraries not found])
-fi
+if test x$enable_qt_debug = xyes; then
-if test x$enable_qt = xyes; then
- if test x$have_qt = xno; then
- AC_MSG_ERROR([Qt integration explicitly required, and Qt libraries not found])
+ PKG_CHECK_MODULES(DBUS_QT, QtCore_debug >= 4.0, have_qt_debug=yes, have_qt_debug=no)
+ if test x$have_qt_debug = xno; then
+ AC_MSG_ERROR([Qt debug libraries explicitly required, but not found])
+ fi
+
+ QT_CORE=QtCore_debug
+ QT_TESTLIB=QtTest_debug
+ have_qt=yes
+else
+ PKG_CHECK_MODULES(DBUS_QT, QtCore >= 4.0, have_qt=yes, have_qt=no)
+
+ if test x$have_qt = xno ; then
+ AC_MSG_WARN([Qt development libraries not found])
fi
-fi
-if test x$enable_qt = xno; then
- have_qt=no;
+ if test x$enable_qt = xyes; then
+ if test x$have_qt = xno; then
+ AC_MSG_ERROR([Qt integration explicitly required, and Qt libraries not found])
+ fi
+ fi
+ if test x$enable_qt = xno; then
+ have_qt=no;
+ fi
+
+ QT_CORE=QtCore
+ QT_TESTLIB=QtTest
fi
-QT_MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`
+QT_MOC=`$PKG_CONFIG --variable=exec_prefix $QT_CORE`
QT_MOC=${QT_MOC}/bin/moc
AM_CONDITIONAL(HAVE_QT, test x$have_qt = xyes)
@@ -1002,8 +1018,9 @@ AC_SUBST(DBUS_QT_CFLAGS)
AC_SUBST(DBUS_QT_LIBS)
AC_SUBST(QT_MOC)
+
dnl QTestLib detection
-PKG_CHECK_MODULES(DBUS_QTESTLIB, QtTest, have_qtest=yes, have_qtest=no)
+PKG_CHECK_MODULES(DBUS_QTESTLIB, $QT_TESTLIB >= 4.1, have_qtest=yes, have_qtest=no)
if test x$have_qtest = xno ; then
AC_MSG_WARN([Qt Unit Test library not found])