--- cuyo-1.8.5/gwqt.m4.orig	2004-07-07 14:30:39.000000000 +0200
+++ cuyo-1.8.5/gwqt.m4	2004-10-30 19:08:58.435322817 +0200
@@ -62,7 +62,7 @@
 
 # Figure out which version of Qt we are using
 AC_MSG_CHECKING([Qt version])
-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
+QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qt/qglobal.h | perl -p -e 's/\D//g'`
 case "${QT_VER}" in
     2*)
         QT_MAJOR="2"
@@ -122,39 +122,9 @@
         ;;
 
     *)
-        QT_IS_DYNAMIC=`ls /usr/lib/libqt*.so $QTDIR/lib/libqt*.so 2> /dev/null` 
-        if test "x$QT_IS_DYNAMIC" = x;  then
-            QT_IS_STATIC=`ls /usr/lib/libqt*.a $QTDIR/lib/libqt*.a 2> /dev/null`
-            if test "x$QT_IS_STATIC" = x; then
-                AC_MSG_ERROR([*** Couldn't find any Qt libraries])
-            else
-                QT_IS_STATIC="yes"
-            fi
-	else
-                QT_IS_STATIC="no"
-        fi
-
-        if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqt"
-            QT_IS_MT="no"
-        elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqt-mt"
-            QT_IS_MT="yes"
-        elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqte"
-            QT_IS_MT="no"
-            QT_IS_EMBEDDED="yes"
-        elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqte-mt"
-            QT_IS_MT="yes"
-            QT_IS_EMBEDDED="yes"
-        elif test "x`ls /usr/lib/libqt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqt"
-            QT_IS_MT="no"
-        elif test "x`ls /usr/lib/libqt-mt.* 2> /dev/null`" != x ; then
-            QT_LIB="-lqt-mt"
-            QT_IS_MT="yes"
-        fi
+	QT_IS_STATIC="no"
+	QT_LIB="-lqt-mt"
+	QT_IS_MT="yes"
         ;;
 esac
 AC_MSG_CHECKING([if Qt is static])