From: Christian Grothoff Date: Wed, 28 Jul 2010 20:19:39 +0000 (+0000) Subject: fixing #1589 X-Git-Tag: initial-import-from-subversion-38251~20818 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d719b15594de606dd65d9a93e74a605bb0637f3;p=oweals%2Fgnunet.git fixing #1589 --- diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 0713d792d..a10343046 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am @@ -11,6 +11,9 @@ if USE_COVERAGE XLIBS = -lgcov endif +if HAVE_SQLITE + SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la +endif lib_LTLIBRARIES = \ libgnunetdatacache.la @@ -27,7 +30,7 @@ libgnunetdatacache_la_LDFLAGS = \ plugin_LTLIBRARIES = \ - libgnunet_plugin_datacache_sqlite.la \ + $(SQLITE_PLUGIN) \ libgnunet_plugin_datacache_template.la @@ -47,10 +50,14 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -check_PROGRAMS = \ +if HAVE_SQLITE + SQLITE_TESTS = \ test_datacache \ test_datacache_quota \ perf_datacache +endif + +check_PROGRAMS = $(SQLITE_TESTS) if !DISABLE_TEST_RUN TESTS = $(check_PROGRAMS) diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 7904907b6..6fdf73d1a 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am @@ -35,9 +35,12 @@ gnunet_service_datastore_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) +if HAVE_SQLITE + SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la +endif plugin_LTLIBRARIES = \ - libgnunet_plugin_datastore_sqlite.la \ + $(SQLITE_PLUGIN) \ libgnunet_plugin_datastore_template.la @@ -57,12 +60,18 @@ libgnunet_plugin_datastore_template_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -check_PROGRAMS = \ +if HAVE_SQLITE +SQLITE_TESTS = \ test_datastore_api \ test_datastore_api_management \ perf_datastore_api \ perf_plugin_datastore +endif + +check_PROGRAMS = \ + $(SQLITE_TESTS) + if !DISABLE_TEST_RUN TESTS = $(check_PROGRAMS) endif