From befef8e3e4b1e076cb13b32b847cb41c887d8c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 28 Sep 2015 14:40:56 +0200 Subject: [PATCH] Fix sword library detection on multiarch systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit a9ac95c447647a0cd29e5cb25c4a11ff63a8d748) --- sword.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sword.m4 b/sword.m4 index 8326ba3..9febf57 100644 --- a/sword.m4 +++ b/sword.m4 @@ -28,7 +28,8 @@ AC_ARG_ENABLE(static-sword, dnl try to find Sword library files AC_MSG_CHECKING([for Sword library files]) AC_REQUIRE([AC_FIND_ZLIB]) -ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib $prefix/lib64 $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" +sword_multiarch="`gcc -print-multiarch 2>/dev/null`" +ac_sword_library_dirs="$ac_sword_dir/lib/$sword_multiarch $ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib/$sword_multiarch $exec_prefix/lib $prefix/lib/$sword_multiarch $prefix/lib64 $prefix/lib /usr/lib/$sword_multiarch /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib/$sword_multiarch /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" if test "x$ac_static_sword" = "xYES"; then SEARCH_LIBS="libsword.a";