2003-03-06 Michael Meeks <michael@server.home>

        * configure.in: if we don't have kde-config, disable have_qt.

diff --git a/ChangeLog b/ChangeLog
index a023a1c..69f51ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-06  Michael Meeks  <michael@server.home>
+
+       * configure.in: if we don't have kde-config, disable have_qt.
+
 2003-03-07  Anders Carlsson  <andersca@codefactory.se>
 
        * dbus/Makefile.am:

diff --git a/configure.in b/configure.in
index 8569474..0bf239a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -266,11 +266,15 @@ if test -n "$QTDIR" -a -f $QTDIR/include/qglobal.h; then
 fi
 
 dnl linking to kdecore will give us a bit of help from libtool
-kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
-if test -z $kdelibs -a -f $kdelibs/libkdecore.la; then
+if (! kde-config >& /dev/null); then
     have_qt=no
 else
-    DBUS_QT_LIBS=$kdelibs/libkdecore.la
+    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
+    if test -z $kdelibs -a -f $kdelibs/libkdecore.la; then
+        have_qt=no
+    else
+        DBUS_QT_LIBS=$kdelibs/libkdecore.la
+    fi
 fi
 
 if test x$have_qt = xno ; then