summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-12 21:09:37 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-12 21:09:37 +0000
commit49be0750d9c2b16b2a6eaf1086d6486ab023708c (patch)
tree60f3133a7e34c7e9aaa251c0a098d666240fcbe2
parent76e1423b45cad04dc90d1043af4ca0923ebd3d4c (diff)
downloadtdesdk-49be0750d9c2b16b2a6eaf1086d6486ab023708c.tar.gz
tdesdk-49be0750d9c2b16b2a6eaf1086d6486ab023708c.zip
Fix kdesdk FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1258672 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/configure.in.in5
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp4
-rw-r--r--kmtrace/Makefile.am2
3 files changed, 8 insertions, 3 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in b/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
index fbc3f1a8..b025015f 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
+++ b/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
@@ -53,8 +53,13 @@ db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
#endif
#else
+#if DB_VERSION_MAJOR >= 5
+DB *db;
+db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
+#else
error
#endif
+#endif
],
kde_cv_berk_database=$1
)
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 05f31654..95ec19dd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -740,7 +740,7 @@ int
DataBaseManager::count ()
{
DB_BTREE_STAT *dstat = 0;
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) || (DB_VERSION_MAJOR >= 5)
db->stat (db, NULL, &dstat, DB_FAST_STAT);
#else
db->stat (db, &dstat, DB_FAST_STAT);
@@ -979,7 +979,7 @@ DataBaseManager::loadInfo ()
int nrec;
DB_BTREE_STAT *stat;
// memset(&stat,0,sizeof(DB_BTREE_STAT));
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) || (DB_VERSION_MAJOR >= 5)
if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT))
fprintf (stderr, "Cannot stat\n");
#else
diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am
index f887d049..fa686680 100644
--- a/kmtrace/Makefile.am
+++ b/kmtrace/Makefile.am
@@ -42,7 +42,7 @@ ktrace_s.c: $(srcdir)/ktrace.c
$(LN_S) $(srcdir)/ktrace.c $@
kmtracelib_LTLIBRARIES = libktrace.la
-libktrace_la_LDFLAGS = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -avoid-version
+libktrace_la_LDFLAGS = -avoid-version
libktrace_la_SOURCES = ksotrace.cpp ktrace.c
libktrace_la_LIBADD = $(LIBDL)