From 75b325f3067f3efeb9ab60e672d0bb4a515ce5d4 Mon Sep 17 00:00:00 2001
From: gsherman <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sun, 30 Nov 2003 01:37:43 +0000
Subject: [PATCH] tweaks to Qt detection

git-svn-id: http://svn.osgeo.org/qgis/trunk@312 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 acinclude.m4 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 94f6dee1631..685db1ca751 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -86,12 +86,13 @@ case "${host}" in
         ;;
 
     *)
-        QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
+        QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null`
         if test "x$QT_IS_STATIC" = x; then
             QT_IS_STATIC="no"
         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
@@ -99,10 +100,10 @@ case "${host}" in
             fi
         fi
 
-        if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+        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.* 2> /dev/null`" != x ; then
+        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/libqte.* 2> /dev/null`" != x ; then
@@ -116,6 +117,7 @@ case "${host}" in
         fi
         ;;
 esac
+#echo "QT_LIB is $QT_LIB"
 AC_MSG_CHECKING([if Qt is static])
 AC_MSG_RESULT([$QT_IS_STATIC])
 AC_MSG_CHECKING([if Qt is multithreaded])
@@ -125,6 +127,7 @@ AC_MSG_RESULT([$QT_IS_EMBEDDED])
 
 QT_GUILINK=""
 QASSISTANTCLIENT_LDADD="-lqassistantclient"
+#echo "host is ${host}"
 case "${host}" in
     *irix*)
         QT_LIBS="$QT_LIB"
@@ -186,7 +189,6 @@ case "${host}" in
 
 esac
 
-
 if test x"$QT_IS_EMBEDDED" = "xyes" ; then
         QT_CXXFLAGS="-DQWS $QT_CXXFLAGS"
 fi