dbus Makefile.am,1.23,1.24 configure.in,1.133,1.134

[Harald Fernengel]

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

Modified Files:
	Makefile.am configure.in 
Log Message:
bring Qt3 library back. Some apps that are not in the KDE trunk are using it.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	21 Mar 2005 02:31:09 -0000	1.23
+++ Makefile.am	30 Sep 2005 15:20:08 -0000	1.24
@@ -8,6 +8,10 @@
    QT_SUBDIR=qt
 endif
 
+if HAVE_QT3
+   QT3_SUBDIR=qt3
+endif
+
 if DBUS_USE_GCJ
    GCJ_SUBDIR=gcj
 endif
@@ -28,8 +32,8 @@
 		echo "You have to build with Qt and GLib to make dist" ;	\
 	fi 
 
-SUBDIRS=dbus bus doc $(GLIB_SUBDIR) $(GCJ_SUBDIR) $(MONO_SUBDIR) $(QT_SUBDIR) $(PYTHON_SUBDIR) tools test
-DIST_SUBDIRS=dbus bus doc glib qt gcj mono python tools test
+SUBDIRS=dbus bus doc $(GLIB_SUBDIR) $(GCJ_SUBDIR) $(MONO_SUBDIR) $(QT_SUBDIR) $(QT3_SUBDIR) $(PYTHON_SUBDIR) tools test
+DIST_SUBDIRS=dbus bus doc glib qt qt3 gcj mono python tools test
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC)

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- configure.in	30 Sep 2005 13:55:55 -0000	1.133
+++ configure.in	30 Sep 2005 15:20:08 -0000	1.134
@@ -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(qt3,              [  --enable-qt3          enable Qt3-friendly client library],enable_qt3=$enableval,enable_qt3=auto)
 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)
 AC_ARG_ENABLE(tests,            [  --enable-tests        enable unit test code],enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
@@ -928,6 +929,50 @@
 AC_SUBST(DBUS_GTK_THREADS_LIBS)
 
 
+dnl Qt3 detection
+AC_PATH_PROG(QT3_MOC, moc, no)
+
+have_qt=no
+AC_MSG_CHECKING([for qglobal.h])
+if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
+    have_qt=yes
+    DBUS_QT3_CXXFLAGS="-I$QTDIR/include"
+else
+    for dir in "${prefix}/include/qt" "/usr/include/qt-3.1" "/usr/include/qt3" "/usr/include/qt" "/usr/lib/qt/include" "/usr/lib/qt-3.1/include"; do
+        if test -f "$dir/qglobal.h"; then
+            have_qt3=yes
+            DBUS_QT3_CXXFLAGS="-I$dir"
+            DBUS_QT3_LIBS="-L$QTDIR/lib -lqt-mt"
+       fi
+    done
+fi
+if test x"$have_qt3" = x"yes"; then
+   AC_MSG_RESULT([found])
+else
+   AC_MSG_RESULT([not found])
+fi
+
+if test x$have_qt3 = xno ; then
+    AC_MSG_WARN([Qt3 development libraries not found])
+fi
+
+if test x$enable_qt3 = xyes; then
+    if test x$have_qt3 = xno; then
+	AC_MSG_ERROR([Qt3 integration explicitly required, and Qt3 libraries not found])
+    fi
+fi
+
+if test x$enable_qt3 = xno; then
+   have_qt3=no;
+fi
+
+AM_CONDITIONAL(HAVE_QT3, test x$have_qt3 = xyes)
+
+dnl Qt flags
+AC_SUBST(DBUS_QT3_CXXFLAGS)
+AC_SUBST(DBUS_QT3_LIBS)
+
+
 dnl Qt detection
 PKG_CHECK_MODULES(DBUS_QT, QtCore >= 4.0, have_qt=yes, have_qt=no)
 
@@ -1286,6 +1331,7 @@
 python/Makefile
 python/examples/Makefile
 qt/Makefile
+qt3/Makefile
 gcj/Makefile
 gcj/org/Makefile
 gcj/org/freedesktop/Makefile
@@ -1370,6 +1416,7 @@
         Building assertions:      ${enable_asserts}
         Building checks:          ${enable_checks}
         Building Qt bindings:     ${have_qt}
+        Building Qt3 bindings:    ${have_qt3}
         Building GLib bindings:   ${have_glib}
         Building Python bindings: ${have_python}
         Building SELinux support: ${have_selinux}