dbus configure.in,1.140,1.141

[Harald Fernengel]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv15056

Modified Files:
	configure.in 
Log Message:
allow linking to debug Qt libraries, use QTestLib >= 4.1


Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- configure.in	22 Nov 2005 20:42:49 -0000	1.140
+++ configure.in	22 Jan 2006 19:42:00 -0000	1.141
@@ -47,6 +47,7 @@
 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 @@
 
 
 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
-fi
 
-if test x$enable_qt = xno; then
-   have_qt=no;
+    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
+
+    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_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])