diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-09-28 14:40:56 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-09-28 14:41:44 +0200 |
| commit | befef8e3e4b1e076cb13b32b847cb41c887d8c2d (patch) | |
| tree | f001b48e6bb7c0ecca94e618697f18d2926a6637 /sword.m4 | |
| parent | 62755d2c270acf8993077c1ba915e01bd4cb06d9 (diff) | |
| download | bibletime-befef8e3e4b1e076cb13b32b847cb41c887d8c2d.tar.gz bibletime-befef8e3e4b1e076cb13b32b847cb41c887d8c2d.zip | |
Fix sword library detection on multiarch systems
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a9ac95c447647a0cd29e5cb25c4a11ff63a8d748)
Diffstat (limited to 'sword.m4')
| -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/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"; |