[longomatch] Disable migration tool if db4o is not found
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Disable migration tool if db4o is not found
- Date: Wed, 5 Nov 2014 19:02:01 +0000 (UTC)
commit d469e44a11602fabf076f61684b1febe47f797ea
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Thu Oct 30 18:46:16 2014 +0100
Disable migration tool if db4o is not found
Makefile.am | 5 ++++-
README | 3 +--
configure.ac | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 34ddbe1..8a73acf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,12 @@ SUBDIRS = \
LongoMatch.Plugins \
LongoMatch.Services \
LongoMatch \
- LongoMatch.Migration \
po
+if WITH_MIGRATION_TOOL
+SUBDIRS += LongoMatch.Migration
+endif
+
DISTCLEANFILES = intltool-extract\
intltool-merge\
intltool-update
diff --git a/README b/README
index de1e897..cf6cf61 100644
--- a/README
+++ b/README
@@ -41,8 +41,7 @@ Dependencies
* Mono >= 2.0
* GTK# >= 2.12
* GStreamer >= 0.10.24
- * GNonlin >= 0.10.11
- * db4o
+ * Json.NET >= 5.0
We strongly recommend to use the latest GStreamer core version, as well as have installed all the GStreamer
modules to get the best user experience.
diff --git a/configure.ac b/configure.ac
index 92c4544..69059dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,11 +74,13 @@ PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-2.0])
AC_SUBST(GTKSHARP_LIBS)
PKG_CHECK_MODULES([JSON], [newtonsoft-json])
AC_SUBST(JSON_LIBS)
-PKG_CHECK_MODULES([DB4O], [db4o])
+PKG_CHECK_MODULES([DB4O], [db40], [HAVE_DB4O=1], [HAVE_DB4O=0])
AC_SUBST(DB4O_LIBS)
PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
AC_SUBST(MONO_ADDINS_LIBS)
+AM_CONDITIONAL(WITH_MIGRATION_TOOL, [test "$HAVE_DB4O" -eq 1])
+
dnl package checks for libcesarplayer
PKG_CHECK_MODULES(CESARPLAYER, [gtk+-2.0 >= 2.8 gdk-2.0 gio-2.0 glib-2.0 gstreamer-0.10 gstreamer-audio-0.10
gstreamer-video-0.10 gstreamer-pbutils-0.10 gobject-2.0 gstreamer-interfaces-0.10 gstreamer-tag-0.10
gstreamer-app-0.10])
AC_SUBST(CESARPLAYER_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]