diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-10-29 18:17:38 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-01-17 13:27:56 +0100 |
| commit | 351c95fe16505298db187a17e4ceff8d2377190b (patch) | |
| tree | a29c14d249bc8de4d03c9421e832d897c52cf047 /admin | |
| parent | 15c430b36a6f76968e3daae6e9a443f17d8ba0b9 (diff) | |
| download | kvirc-351c95fe16505298db187a17e4ceff8d2377190b.tar.gz kvirc-351c95fe16505298db187a17e4ceff8d2377190b.zip | |
Fix TQt library detection on multiarch systems.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3b217bbf505473102331a7e2ed274fe63a4c3457)
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/acinclude.m4.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 186e6e98..b8a7385d 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 "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $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" |