diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-28 20:19:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-28 20:19:39 +0000 |
commit | 7d719b15594de606dd65d9a93e74a605bb0637f3 (patch) | |
tree | cb3cb3d72c3add3dc6068c767159faf15e69c3a1 /src | |
parent | d72151f265cb7aacb184c1fbd160d6a323ccd9aa (diff) | |
download | gnunet-7d719b15594de606dd65d9a93e74a605bb0637f3.tar.gz gnunet-7d719b15594de606dd65d9a93e74a605bb0637f3.zip |
fixing #1589
Diffstat (limited to 'src')
-rw-r--r-- | src/datacache/Makefile.am | 11 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 13 |
2 files changed, 20 insertions, 4 deletions
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 | |||
11 | XLIBS = -lgcov | 11 | XLIBS = -lgcov |
12 | endif | 12 | endif |
13 | 13 | ||
14 | if HAVE_SQLITE | ||
15 | SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la | ||
16 | endif | ||
14 | 17 | ||
15 | lib_LTLIBRARIES = \ | 18 | lib_LTLIBRARIES = \ |
16 | libgnunetdatacache.la | 19 | libgnunetdatacache.la |
@@ -27,7 +30,7 @@ libgnunetdatacache_la_LDFLAGS = \ | |||
27 | 30 | ||
28 | 31 | ||
29 | plugin_LTLIBRARIES = \ | 32 | plugin_LTLIBRARIES = \ |
30 | libgnunet_plugin_datacache_sqlite.la \ | 33 | $(SQLITE_PLUGIN) \ |
31 | libgnunet_plugin_datacache_template.la | 34 | libgnunet_plugin_datacache_template.la |
32 | 35 | ||
33 | 36 | ||
@@ -47,10 +50,14 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \ | |||
47 | $(GN_PLUGIN_LDFLAGS) | 50 | $(GN_PLUGIN_LDFLAGS) |
48 | 51 | ||
49 | 52 | ||
50 | check_PROGRAMS = \ | 53 | if HAVE_SQLITE |
54 | SQLITE_TESTS = \ | ||
51 | test_datacache \ | 55 | test_datacache \ |
52 | test_datacache_quota \ | 56 | test_datacache_quota \ |
53 | perf_datacache | 57 | perf_datacache |
58 | endif | ||
59 | |||
60 | check_PROGRAMS = $(SQLITE_TESTS) | ||
54 | 61 | ||
55 | if !DISABLE_TEST_RUN | 62 | if !DISABLE_TEST_RUN |
56 | TESTS = $(check_PROGRAMS) | 63 | 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 = \ | |||
35 | $(top_builddir)/src/util/libgnunetutil.la \ | 35 | $(top_builddir)/src/util/libgnunetutil.la \ |
36 | $(GN_LIBINTL) | 36 | $(GN_LIBINTL) |
37 | 37 | ||
38 | if HAVE_SQLITE | ||
39 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la | ||
40 | endif | ||
38 | 41 | ||
39 | plugin_LTLIBRARIES = \ | 42 | plugin_LTLIBRARIES = \ |
40 | libgnunet_plugin_datastore_sqlite.la \ | 43 | $(SQLITE_PLUGIN) \ |
41 | libgnunet_plugin_datastore_template.la | 44 | libgnunet_plugin_datastore_template.la |
42 | 45 | ||
43 | 46 | ||
@@ -57,12 +60,18 @@ libgnunet_plugin_datastore_template_la_LDFLAGS = \ | |||
57 | $(GN_PLUGIN_LDFLAGS) | 60 | $(GN_PLUGIN_LDFLAGS) |
58 | 61 | ||
59 | 62 | ||
60 | check_PROGRAMS = \ | 63 | if HAVE_SQLITE |
64 | SQLITE_TESTS = \ | ||
61 | test_datastore_api \ | 65 | test_datastore_api \ |
62 | test_datastore_api_management \ | 66 | test_datastore_api_management \ |
63 | perf_datastore_api \ | 67 | perf_datastore_api \ |
64 | perf_plugin_datastore | 68 | perf_plugin_datastore |
65 | 69 | ||
70 | endif | ||
71 | |||
72 | check_PROGRAMS = \ | ||
73 | $(SQLITE_TESTS) | ||
74 | |||
66 | if !DISABLE_TEST_RUN | 75 | if !DISABLE_TEST_RUN |
67 | TESTS = $(check_PROGRAMS) | 76 | TESTS = $(check_PROGRAMS) |
68 | endif | 77 | endif |