From c4ffb40f0d18299b25614ca10d5ce5fd489509e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 28 Sep 2015 14:58:57 +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 19ee0ed782e5535aeb99aec95c95a023a1c7c738) --- sword.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sword.m4 b/sword.m4 index 0b8c687..27ddacf 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/lib $libdir $libdir/sword /usr/lib64 /usr/lib /usr/local/lib64 /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/lib64 $ac_sword_dir/lib/$sword_multiarch $ac_sword_dir/lib $libdir/$sword_multiarch $libdir $libdir/sword /usr/lib64 /usr/lib/$sword_multiarch /usr/lib /usr/local/lib64 /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";