Browse Source

Fix FTBFS on Fedora 20

Fix custom-installed Sword detection
tags/r14.0.0
Francois Andriot Slávek Banko <slavek.banko@axis.cz> 6 years ago
parent
commit
298da70ab4
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      bibletime/backend/clanguagemgr.cpp
  2. +1
    -1
      sword.m4

+ 3
- 3
bibletime/backend/clanguagemgr.cpp View File

@@ -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 );
}
};



+ 1
- 1
sword.m4 View File

@@ -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