summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-09-28 14:58:57 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-09-28 14:58:57 +0200
commit19ee0ed782e5535aeb99aec95c95a023a1c7c738 (patch)
treeb233c7ad13032e51c53af47f3998d211be9c65d9
parent953b7eb2146a2cb180904acc0ef65b3eb7ddbe8a (diff)
downloadtdeio-sword-19ee0ed7.tar.gz
tdeio-sword-19ee0ed7.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 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";