dbus configure.in,1.131,1.132

Harald Fernengel harry at freedesktop.org
Fri Sep 23 09:24:38 PDT 2005


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

Modified Files:
	configure.in 
Log Message:
adding an autotest and "dbus-ify" the build process and include scheme


Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- configure.in	23 Sep 2005 13:08:26 -0000	1.131
+++ configure.in	23 Sep 2005 16:24:36 -0000	1.132
@@ -943,7 +943,7 @@
 
 if test x$enable_qt = xno; then
    have_qt=no;
-   fi
+fi
 
 QT_MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`
 QT_MOC=${QT_MOC}/bin/moc
@@ -955,6 +955,22 @@
 AC_SUBST(DBUS_QT_LIBS)
 AC_SUBST(QT_MOC)
 
+dnl QTestLib detection
+PKG_CHECK_MODULES(DBUS_QTESTLIB, QtTest, have_qtest=yes, have_qtest=no)
+
+if test x$have_qtest = xno ; then
+    AC_MSG_WARN([Qt Unit Test library not found])
+fi
+
+if test x$have_qt = xno; then
+    have_qtest=no
+fi
+
+AM_CONDITIONAL(HAVE_QTESTLIB, test x$have_qtest = xyes)
+
+AC_SUBST(DBUS_QTESTLIB_CFLAGS)
+AC_SUBST(DBUS_QTESTLIB_LIBS)
+
 ### X11 detection
 AC_PATH_XTRA
 
@@ -1276,6 +1292,7 @@
 test/Makefile
 test/glib/Makefile
 test/python/Makefile
+test/qt/Makefile
 doc/Makefile
 dbus-1.pc
 dbus-glib-1.pc



More information about the dbus-commit mailing list