--- qsampler/trunk/configure.in	2005/06/15 13:57:29	652
+++ qsampler/trunk/configure.in	2005/06/15 17:55:55	653
@@ -48,18 +48,22 @@
   AC_MSG_RESULT([$QTDIR])
 fi
 
+CFLAGS="$CFLAGS -I$QTDIR/include"
+CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
+LIBS="-L$QTDIR/lib"
+for X in qt qt3; do
+  if test -d $QTDIR/include/$X; then
+    CFLAGS="$CFLAGS -I$QTDIR/include/$X"
+    CPPFLAGS="$CPPFLAGS -I$QTDIR/include/$X"
+  fi
+done
+
 dnl Checks for Qt library.
-AC_CACHE_CHECK([for Qt library],
-  ac_qtlib, [
-  for X in qt-mt qt; do
-    if test "x$ac_qtlib" = "x"; then
-      if test -f $QTDIR/lib/lib$X.so -o -f $QTDIR/lib/lib$X.a \
-           -o -f $QTDIR/lib/lib$X.la -o -f $QTDIR/lib/lib$X.dylib; then
-        ac_qtlib=$X
-      fi
-    fi
-  done
-])
+for X in qt-mt qt; do
+  if test "x$ac_qtlib" = "x"; then
+     AC_CHECK_LIB($X, main, [ac_qtlib=$X])
+  fi
+done
 if test "x$ac_qtlib" = "x"; then
   AC_MSG_ERROR([Qt library not found. Maybe QTDIR isn't properly set.])
 fi
@@ -71,16 +75,6 @@
 fi
 AC_SUBST(ac_thread)
 
-CFLAGS="$CFLAGS -I$QTDIR/include"
-CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
-LIBS="-L$QTDIR/lib"
-for X in qt qt3; do
-  if test -d $QTDIR/include/$X; then
-    CFLAGS="$CFLAGS -I$QTDIR/include/$X"
-    CPPFLAGS="$CPPFLAGS -I$QTDIR/include/$X"
-  fi
-done
-
 AC_CACHE_CHECK([for Qt library version >= 3.1.1],
   ac_qtlib_version, [
   AC_TRY_LINK([#include "qglobal.h"], [