|
Check-in Number:
|
4086 | |
| Date: |
2003-Feb-26 17:09:29 (local)
2003-Feb-26 16:09:29 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Scan for libraries completely, all of dynamic X static X plain X threaded
combinations are handled. A static threaded libqt-mt.a is preferred. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/aclocal.m4 1.13 -> 1.14
--- aclocal.m4 2003/01/23 11:57:16 1.13
+++ aclocal.m4 2003/02/26 16:09:29 1.14
@@ -319,16 +319,30 @@
c_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
done
-dnl ## Shared object library is scanned
+dnl ## Scan to find out which Qt library to link against
dnl ## FIXME Merge static and dynamic library search blocks
-for file in x `find $QTBASE/lib -name "libqt*.so" -print`; do
+for file in x `find $QTBASE/lib -name "libqt.so" -print`; do
test .$file = .x && continue
l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
done
-dnl ## But the static library is preferred
-for file in x `find $QTBASE/lib -name "libqt*.a" -print`; do
+dnl ## If we have a multithreaded shared library, then it's better
+for file in x `find $QTBASE/lib -name "libqt-mt.so" -print`; do
+ test .$file = .x && continue
+ l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
+ lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.so;\1;'`
+done
+
+dnl ## If we have static libraries, then prefer to use those
+for file in x `find $QTBASE/lib -name "libqt.a" -print`; do
+ test .$file = .x && continue
+ l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
+ lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
+done
+
+dnl ## But the static multithreaded library is preferred above all
+for file in x `find $QTBASE/lib -name "libqt-mt.a" -print`; do
test .$file = .x && continue
l_dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
lib=`echo $file | sed -e 's;^.*/\(.*\)$;\1;' -e 's;lib\(.*\)\.a;\1;'`
|
|
