Fix FTBFS on Fedora 20

Fix custom-installed Sword detection
r14.0.x
Francois Andriot 10 years ago committed by Slávek Banko
parent caa0568c57
commit 298da70ab4

@ -95,10 +95,10 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) {
// for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
abbrev = (*it)->module()->Lang();
const char* mod = (*it)->module()->Lang();
if (abbrev && !abbrevs.contains(abbrev)) {
abbrevs.append( abbrev );
if (mod && !abbrevs.contains(mod)) {
abbrevs.append( mod );
}
};

@ -28,7 +28,7 @@ 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 $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
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"
if test "x$ac_static_sword" = "xYES"; then
SEARCH_LIBS="libsword.a";

Loading…
Cancel
Save