Browse Source

Fix TQt library detection on multiarch systems.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 5 months ago
parent
commit
3b217bbf50
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
2 changed files with 8 additions and 4 deletions
  1. 4
    2
      acinclude.m4
  2. 4
    2
      admin/acinclude.m4.in

+ 4
- 2
acinclude.m4 View File

@@ -1495,7 +1495,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
1495 1495
 [
1496 1496
 	AC_MSG_CHECKING([for the general Qt3.x directory])
1497 1497
 
1498
-	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 /"
1498
+	lib_multiarch="`gcc -print-multiarch 2>/dev/null`"
1499
+	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 /"
1499 1500
 	ss_qt_general_test_dirs="$ss_qt_general_test_dirs /usr/local/kde /usr/opt/kde"
1500 1501
 
1501 1502
 	if test -n "$HOME"; then
@@ -1697,7 +1698,8 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
1697 1698
 	if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then
1698 1699
 		AC_MSG_CHECKING([for the TQt library])
1699 1700
 
1700
-		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"
1701
+		lib_multiarch="`gcc -print-multiarch 2>/dev/null`"
1702
+		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"
1701 1703
 		test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"
1702 1704
 		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"
1703 1705
 

+ 4
- 2
admin/acinclude.m4.in View File

@@ -1495,7 +1495,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
1495 1495
 [
1496 1496
 	AC_MSG_CHECKING([for the general Qt3.x directory])
1497 1497
 
1498
-	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 /"
1498
+	lib_multiarch="`gcc -print-multiarch 2>/dev/null`"
1499
+	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 /"
1499 1500
 	ss_qt_general_test_dirs="$ss_qt_general_test_dirs /usr/local/kde /usr/opt/kde"
1500 1501
 
1501 1502
 	if test -n "$HOME"; then
@@ -1697,7 +1698,8 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
1697 1698
 	if test "$SS_QT3_LIBDIR" = "NOTGIVEN"; then
1698 1699
 		AC_MSG_CHECKING([for the TQt library])
1699 1700
 
1700
-		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"
1701
+		lib_multiarch="`gcc -print-multiarch 2>/dev/null`"
1702
+		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"
1701 1703
 		test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"
1702 1704
 		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"
1703 1705
 

Loading…
Cancel
Save