Browse Source

Auto-detect Sword module version

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1173694 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 11 years ago
parent
commit
9ba35d28ae
  1. 4
      bibletime/backend/cswordbiblemoduleinfo.cpp
  2. 4
      bibletime/backend/cswordversekey.cpp
  3. 21
      configure.in.in

4
bibletime/backend/cswordbiblemoduleinfo.cpp

@ -26,10 +26,6 @@
// TODO: Detect Boost in autoconf
#include <boost/scoped_ptr.hpp>
// Needed for new Sword libraries
// TODO: Move this into autoconf
#define SWORD_MULTIVERSE
static sword::VerseKey staticKey;
CSwordBibleModuleInfo::CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend )

4
bibletime/backend/cswordversekey.cpp

@ -25,10 +25,6 @@
// TODO: Detect Boost in autoconf
#include <boost/scoped_ptr.hpp>
// Needed for new Sword libraries
// TODO: Move this into autoconf
#define SWORD_MULTIVERSE
CSwordVerseKey::CSwordVerseKey( CSwordModuleInfo* const module ) : CSwordKey(module) {
if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module) ) {
key( bible->lowerBound().key() );

21
configure.in.in

@ -56,9 +56,28 @@ if test "x$enable_howto" = xyes; then
fi
AC_SUBST(HOWTODIR)
dnl Chek for the used distribution
dnl Check for the used distribution
AC_CHECK_DISTRIBUTION
dnl Check bibletime API version
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
cxx_flags_safe="$CXXFLAGS"
cflags_safe="$CFLAGS"
CXXFLAGS="$CXXFLAGS -I$ac_cv_sword_incdir"
CFLAGS="$CFLAGS -I$ac_cv_sword_incdir"
AC_MSG_CHECKING([if Sword provides the old API])
AC_TRY_COMPILE([#include <versekey.h>
static sword::VerseKey staticKey;
sword::sbook current_book;
],[current_book = staticKey.books[1][1];],
AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_DEFINE(SWORD_MULTIVERSE,1,[no])])
CXXFLAGS="$cxx_flags_safe"
CFLAGS="$cflags_safe"
AC_LANG_RESTORE
dnl add here all your Makefiles. They are created by configure
AC_CONFIG_FILES([ README ])

Loading…
Cancel
Save