diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-09-28 14:58:57 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-09-28 14:59:10 +0200 |
| commit | c4ffb40f0d18299b25614ca10d5ce5fd489509e4 (patch) | |
| tree | 280228ce315635d5080c1f7325b96bce48d0f5ce | |
| parent | 669155906834729b884d04a7b9f9a3feaa0b8492 (diff) | |
| download | tdeio-sword-c4ffb40f0d18299b25614ca10d5ce5fd489509e4.tar.gz tdeio-sword-c4ffb40f0d18299b25614ca10d5ce5fd489509e4.zip | |
Fix sword library detection on multiarch systems
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 19ee0ed782e5535aeb99aec95c95a023a1c7c738)
| -rw-r--r-- | sword.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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"; |