[kaffe] CVS kaffe (dalibor): Bero's fix to prefer multithreaded Qt libs for QtAWT

[Kaffe CVS]

PatchSet 3983 
Date: 2003/08/26 15:39:07
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Bero's fix to prefer multithreaded Qt libs for QtAWT

Members: 
	ChangeLog:1.1580->1.1581 
	aclocal.m4:1.66->1.67 
	configure:1.250->1.251 
	gwqt.m4:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1580 kaffe/ChangeLog:1.1581
--- kaffe/ChangeLog:1.1580	Tue Aug 26 15:03:08 2003
+++ kaffe/ChangeLog	Tue Aug 26 15:39:07 2003
@@ -1,3 +1,14 @@
+2003-08-26  Bernhard Rosenkraenzer <bero@arklinux.org>
+
+	* gwqt.m4:
+	If both qt and qt-mt are installed, kaffe uses qt
+	unconditionally. Preferring qt-mt is preferrable because
+	that's what KDE uses and therefore it's usually in memory [I
+	assume that people who want --with-awt=qt are mostly KDE users]
+
+	* configure:
+	Regenerated.
+	
 2003-08-26  Dalibor Topic <robilad@kaffe.org>
 
 	* libraries/clib/awt/qt/Makefile.am:
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.66 kaffe/aclocal.m4:1.67
--- kaffe/aclocal.m4:1.66	Thu Jul 17 10:57:28 2003
+++ kaffe/aclocal.m4	Tue Aug 26 15:39:08 2003
@@ -8550,19 +8550,19 @@
             fi
         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
+        if 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"
+        elif test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+            QT_LIB="-lqt"
             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 $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+            QT_LIB="-lqte"
+            QT_IS_MT="no"
             QT_IS_EMBEDDED="yes"
         fi
         ;;
Index: kaffe/configure
diff -u kaffe/configure:1.250 kaffe/configure:1.251
--- kaffe/configure:1.250	Wed Aug  6 13:13:25 2003
+++ kaffe/configure	Tue Aug 26 15:39:08 2003
@@ -40858,19 +40858,19 @@
             fi
         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
+        if 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"
+        elif test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+            QT_LIB="-lqt"
             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 $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+            QT_LIB="-lqte"
+            QT_IS_MT="no"
             QT_IS_EMBEDDED="yes"
         fi
         ;;
Index: kaffe/gwqt.m4
diff -u kaffe/gwqt.m4:1.4 kaffe/gwqt.m4:1.5
--- kaffe/gwqt.m4:1.4	Sun Jun 22 09:51:11 2003
+++ kaffe/gwqt.m4	Tue Aug 26 15:39:12 2003
@@ -93,19 +93,19 @@
             fi
         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
+        if 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"
+        elif test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+            QT_LIB="-lqt"
             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 $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+            QT_LIB="-lqte"
+            QT_IS_MT="no"
             QT_IS_EMBEDDED="yes"
         fi
         ;;