[patch] dbus-0.21 doesn't like QT 2

[Adrian Bunk]

I got the following compile error in dbus-0.21 with QT 2
installed:

<--  snip  -->

...
checking for qglobal.h... found
...
        Building Qt bindings:     yes
...
 g++ -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I/usr/local/DIR/qt-2.3.1/include 
-DDBUS_API_SUBJECT_TO_CHANGE=1 -O2 -mcpu=v8 -I/usr/local/include/ 
-R/usr/local/lib -R/usr/X11R6/lib/ -c dbus-qthread.cpp -Wp,-MD,.deps/dbus-qthread.TPlo  -fPIC 
-DPIC -o .libs/dbus-qthread.o
dbus-qthread.cpp:25: qmutex.h: No such file or directory
gmake[2]: *** [dbus-qthread.lo] Error 1
gmake[2]: Leaving directory `/aux/adrian/build/dbus-0.21/qt'

<--  snip  -->

I'd suggest the patch below to let configure check for qmutex.h instead 
of qglobal.h.

cu
Adrian

BTW: Please Cc me on replies.


--- configure.in.old	2004-03-19 22:21:42.000000000 +0100
+++ configure.in	2004-04-03 02:06:19.000000000 +0200
@@ -698,13 +698,13 @@
 AC_PATH_PROG(QT_MOC, moc, no)
 
 have_qt=no
-AC_MSG_CHECKING([for qglobal.h])
-if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
+AC_MSG_CHECKING([for qmutex.h])
+if test -n "$QTDIR" -a -f "$QTDIR/include/qmutex.h"; then
     have_qt=yes
     DBUS_QT_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
+        if test -f "$dir/qmutex.h"; then
             have_qt=yes
             DBUS_QT_CXXFLAGS="-I$dir"
        fi