--- plugins/qt-gui/aclocal.m4.orig	Wed Jul 12 05:54:25 2000
+++ plugins/qt-gui/aclocal.m4	Mon Sep 25 14:45:24 2000
@@ -59,7 +59,7 @@
       fi
 
       for qt_dir in $qt_library_dirs; do
-        for qt_check_lib in $qt_dir/libqt.so.2; do
+        for qt_check_lib in $qt_dir/libqt2.so.4; do
           if test -r $qt_check_lib; then
             ac_qt_libraries=$qt_dir
             break 2
@@ -79,17 +79,12 @@
   else
     have_qt_lib="yes"
     dnl Check if we have the right lib
-    output=`eval "strings $ac_cv_lib_qtlib/libqt.so | grep -l QCString"`
+    output=`eval "strings $ac_cv_lib_qtlib/libqt2.so | grep -l QCString"`
     if test -z "$output"; then
       AC_MSG_ERROR([
           The Qt lib directory "$ac_cv_lib_qtlib"
           found by configure doesn't contain a Qt 2.1.x library.
 
-          To overcome special features of the GNU ld (aka bugs), the
-          libqt.so file _needs_ to point to libqt.so.2 which needs
-          to point to a Qt 2.1 library.
-          (this is only needed during compiling and linking, not at runtime)
-
           Please check your installation.
 
           Use the --with-qt-libraries option if we found the wrong Qt lib.
@@ -196,8 +191,8 @@
 
     AC_PATH_PROG(
       MOC,
-      moc,
-      $QTDIR/bin/moc,
+      moc2,
+      $QTDIR/bin/moc2,
       $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
     )
   else