summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-09-28 14:40:56 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-09-28 14:40:56 +0200
commita9ac95c447647a0cd29e5cb25c4a11ff63a8d748 (patch)
tree09440f82f3663bdb71ac15a6c89ef5a407d479ae
parentec50cf2c9f71a05ae2d015b145cc7c1a2cb4cbf6 (diff)
downloadbibletime-a9ac95c4.tar.gz
bibletime-a9ac95c4.zip
Fix sword library detection on multiarch systems
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--sword.m43
1 files changed, 2 insertions, 1 deletions
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";