summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-10-29 18:17:38 +0100
committerSlávek Banko <slavek.banko@axis.cz>2018-10-29 18:17:38 +0100
commit3b217bbf505473102331a7e2ed274fe63a4c3457 (patch)
tree92baab19253f2232facf07f677d73261acd535d1 /admin
parent7d383aafeca23bcf7356c2c65784d9144d23f996 (diff)
downloadkvirc-3b217bbf505473102331a7e2ed274fe63a4c3457.tar.gz
kvirc-3b217bbf505473102331a7e2ed274fe63a4c3457.zip
Fix TQt library detection on multiarch systems.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'admin')
-rw-r--r--admin/acinclude.m4.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 1a50d6a7..ca5bc47b 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1495,7 +1495,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
[
AC_MSG_CHECKING([for the general Qt3.x directory])
- ss_qt_general_test_dirs="/usr/local /usr /usr/X11R6 /usr/lib /opt /opt/kde /kde /usr/kde /usr/build /usr/src /usr/local/lib /"
+ lib_multiarch="`gcc -print-multiarch 2>/dev/null`"
+ ss_qt_general_test_dirs="/usr/local /usr /usr/X11R6 /usr/lib/$lib_multiarch /usr/lib /opt /opt/kde /kde /usr/kde /usr/build /usr/src /usr/local/lib /"
ss_qt_general_test_dirs="$ss_qt_general_test_dirs /usr/local/kde /usr/opt/kde"
if test -n "$HOME"; then
@@ -1697,7 +1698,8 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then
AC_MSG_CHECKING([for the TQt library])
- ss_qt_library_test_dirs="$SS_QT3_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
+ lib_multiarch="`gcc -print-multiarch 2>/dev/null`"
+ ss_qt_library_test_dirs="$SS_QT3_GENERAL_DIR/lib /lib/$lib_multiarch /usr/lib/$lib_multiarch /usr/local/lib/$lib_multiarch /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"