diff --git a/acinclude.m4 b/acinclude.m4
index 8fbfa5e46ac..36d5243f72a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -66,10 +66,21 @@ QT_CXXFLAGS="-I$QTDIR/include"
 
 QT_IS_EMBEDDED="no"
 # On unix, figure out if we're doing a static or dynamic link
+
 case "${host}" in
     *-cygwin)
 	AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform)
-        if test -f "$QTDIR/lib/qt.lib" ; then
+   echo "$QTDIR/lib/qt-mt$QT_VER.lib"
+         if test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then
+            QT_LIB="qt-mt$QT_VER.lib"
+            QT_IS_STATIC="no"
+            QT_IS_MT="yes"
+           
+        elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then
+            QT_LIB="qt$QT_VER.lib"
+            QT_IS_STATIC="no"
+            QT_IS_MT="no"
+        elif test -f "$QTDIR/lib/qt.lib" ; then
             QT_LIB="qt.lib"
             QT_IS_STATIC="yes"
             QT_IS_MT="no"
@@ -77,38 +88,34 @@ case "${host}" in
             QT_LIB="qt-mt.lib" 
             QT_IS_STATIC="yes"
             QT_IS_MT="yes"
-        elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then
-            QT_LIB="qt$QT_VER.lib"
-            QT_IS_STATIC="no"
-            QT_IS_MT="no"
-        elif test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then
-            QT_LIB="qt-mt$QT_VER.lib"
-            QT_IS_STATIC="no"
-            QT_IS_MT="yes"
         fi
         ;;
 
     *)
+    # determin static or dynamic -- prefer dynamic
+      QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 2> /dev/null`
+
+      if test "x$QT_IS_DYNAMIC" = x;  then
         QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
         if test "x$QT_IS_STATIC" = x; then
             QT_IS_STATIC="no"
+            AC_MSG_ERROR([*** Couldn't find any Qt libraries])
         else
             QT_IS_STATIC="yes"
         fi
-	#echo "QT_IS_STATIC=$QT_IS_STATIC"
-        if test x$QT_IS_STATIC = xno ; then
-            QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null` 
-            if test "x$QT_IS_DYNAMIC" = x;  then
-                AC_MSG_ERROR([*** Couldn't find any Qt libraries])
-            fi
-        fi
-
-        if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
+       else
+	    QT_IS_STATIC="no"
+       fi
+    # set link parameters based on shared/mt libs or static lib
+       if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then
             QT_LIB="-lqt"
             QT_IS_MT="no"
         elif test "x`ls $QTDIR/lib/libqt-mt.so* 2> /dev/null`" != x ; then
             QT_LIB="-lqt-mt"
             QT_IS_MT="yes"
+        elif test "x`ls $QTDIR/lib/libqt.so* 2> /dev/null`" != x ; then
+            QT_LIB="-lqt"
+            QT_IS_MT="no"
         elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
             QT_LIB="-lqte"
             QT_IS_MT="no"