diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-24 19:34:53 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-24 19:34:53 +0000 |
commit | f1d741415d9af284955122c931118f2bca5ba2d0 (patch) | |
tree | 23b70808091aa1abaee37614b18647742b4de5c1 /src | |
parent | d26b19c91736433a783ce22b2d95ed490b6d9ca6 (diff) | |
download | gnunet-f1d741415d9af284955122c931118f2bca5ba2d0.tar.gz gnunet-f1d741415d9af284955122c931118f2bca5ba2d0.zip |
-make sure to link against right libgcrypt, enable abort of gnunet-revocation even if identity service is not running
Diffstat (limited to 'src')
-rw-r--r-- | src/nse/Makefile.am | 18 | ||||
-rw-r--r-- | src/revocation/Makefile.am | 3 | ||||
-rw-r--r-- | src/revocation/gnunet-revocation.c | 5 | ||||
-rw-r--r-- | src/scalarproduct/Makefile.am | 3 |
4 files changed, 20 insertions, 9 deletions
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 155fa9acb..b60d38d80 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am | |||
@@ -1,7 +1,7 @@ | |||
1 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 1 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | if MINGW | 3 | if MINGW |
4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 4 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
@@ -30,7 +30,7 @@ libgnunetnse_la_LDFLAGS = \ | |||
30 | 30 | ||
31 | 31 | ||
32 | libexec_PROGRAMS = \ | 32 | libexec_PROGRAMS = \ |
33 | gnunet-service-nse | 33 | gnunet-service-nse |
34 | 34 | ||
35 | if HAVE_TESTING | 35 | if HAVE_TESTING |
36 | noinst_PROGRAMS = \ | 36 | noinst_PROGRAMS = \ |
@@ -46,19 +46,20 @@ gnunet_nse_profiler_LDADD = -lm \ | |||
46 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 46 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
47 | $(GN_LIBINTL) | 47 | $(GN_LIBINTL) |
48 | gnunet_nse_profiler_DEPENDENCIES = \ | 48 | gnunet_nse_profiler_DEPENDENCIES = \ |
49 | libgnunetnse.la | 49 | libgnunetnse.la |
50 | 50 | ||
51 | gnunet_service_nse_SOURCES = \ | 51 | gnunet_service_nse_SOURCES = \ |
52 | gnunet-service-nse.c | 52 | gnunet-service-nse.c |
53 | gnunet_service_nse_LDADD = \ | 53 | gnunet_service_nse_LDADD = \ |
54 | $(top_builddir)/src/nse/libgnunetnse.la \ | 54 | $(top_builddir)/src/nse/libgnunetnse.la \ |
55 | $(top_builddir)/src/util/libgnunetutil.la \ | 55 | $(top_builddir)/src/util/libgnunetutil.la \ |
56 | $(top_builddir)/src/core/libgnunetcore.la \ | 56 | $(top_builddir)/src/core/libgnunetcore.la \ |
57 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 57 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
58 | $(LIBGCRYPT_LIBS) \ | ||
58 | -lm -lgcrypt \ | 59 | -lm -lgcrypt \ |
59 | $(GN_LIBINTL) | 60 | $(GN_LIBINTL) |
60 | gnunet_service_nse_DEPENDENCIES = \ | 61 | gnunet_service_nse_DEPENDENCIES = \ |
61 | libgnunetnse.la | 62 | libgnunetnse.la |
62 | if ENABLE_NSE_HISTOGRAM | 63 | if ENABLE_NSE_HISTOGRAM |
63 | gnunet_service_nse_LDADD += \ | 64 | gnunet_service_nse_LDADD += \ |
64 | $(top_builddir)/src/testbed/libgnunettestbedlogger.la | 65 | $(top_builddir)/src/testbed/libgnunettestbedlogger.la |
@@ -79,7 +80,7 @@ check_PROGRAMS = \ | |||
79 | endif | 80 | endif |
80 | 81 | ||
81 | if ENABLE_TEST_RUN | 82 | if ENABLE_TEST_RUN |
82 | TESTS = $(check_PROGRAMS) | 83 | TESTS = $(check_PROGRAMS) |
83 | endif | 84 | endif |
84 | 85 | ||
85 | test_nse_api_SOURCES = \ | 86 | test_nse_api_SOURCES = \ |
@@ -87,7 +88,7 @@ test_nse_api_SOURCES = \ | |||
87 | test_nse_api_LDADD = \ | 88 | test_nse_api_LDADD = \ |
88 | $(top_builddir)/src/nse/libgnunetnse.la \ | 89 | $(top_builddir)/src/nse/libgnunetnse.la \ |
89 | $(top_builddir)/src/testing/libgnunettesting.la \ | 90 | $(top_builddir)/src/testing/libgnunettesting.la \ |
90 | $(top_builddir)/src/util/libgnunetutil.la | 91 | $(top_builddir)/src/util/libgnunetutil.la |
91 | 92 | ||
92 | test_nse_multipeer_SOURCES = \ | 93 | test_nse_multipeer_SOURCES = \ |
93 | test_nse_multipeer.c | 94 | test_nse_multipeer.c |
@@ -101,7 +102,8 @@ perf_kdf_SOURCES = \ | |||
101 | perf_kdf.c | 102 | perf_kdf.c |
102 | perf_kdf_LDADD = \ | 103 | perf_kdf_LDADD = \ |
103 | $(top_builddir)/src/util/libgnunetutil.la \ | 104 | $(top_builddir)/src/util/libgnunetutil.la \ |
104 | -lgcrypt | 105 | $(LIBGCRYPT_LIBS) \ |
106 | -lgcrypt | ||
105 | 107 | ||
106 | EXTRA_DIST = \ | 108 | EXTRA_DIST = \ |
107 | test_nse.conf \ | 109 | test_nse.conf \ |
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index 25a171001..18d379b0b 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am | |||
@@ -34,6 +34,7 @@ libgnunetrevocation_la_SOURCES = \ | |||
34 | revocation_api.c revocation.h | 34 | revocation_api.c revocation.h |
35 | libgnunetrevocation_la_LIBADD = \ | 35 | libgnunetrevocation_la_LIBADD = \ |
36 | $(top_builddir)/src/util/libgnunetutil.la \ | 36 | $(top_builddir)/src/util/libgnunetutil.la \ |
37 | $(LIBGCRYPT_LIBS) \ | ||
37 | $(GN_LIBINTL) $(XLIB) -lgcrypt | 38 | $(GN_LIBINTL) $(XLIB) -lgcrypt |
38 | libgnunetrevocation_la_LDFLAGS = \ | 39 | libgnunetrevocation_la_LDFLAGS = \ |
39 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 40 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
@@ -66,7 +67,7 @@ test_revocation_LDADD = \ | |||
66 | $(top_builddir)/src/testbed/libgnunettestbed.la | 67 | $(top_builddir)/src/testbed/libgnunettestbed.la |
67 | 68 | ||
68 | check_PROGRAMS = \ | 69 | check_PROGRAMS = \ |
69 | test_revocation | 70 | test_revocation |
70 | 71 | ||
71 | 72 | ||
72 | check_SCRIPTS = \ | 73 | check_SCRIPTS = \ |
diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c index 59f47ab97..5bb7965bf 100644 --- a/src/revocation/gnunet-revocation.c +++ b/src/revocation/gnunet-revocation.c | |||
@@ -90,6 +90,11 @@ static void | |||
90 | do_shutdown (void *cls, | 90 | do_shutdown (void *cls, |
91 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 91 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
92 | { | 92 | { |
93 | if (NULL != el) | ||
94 | { | ||
95 | GNUNET_IDENTITY_ego_lookup_cancel (el); | ||
96 | el = NULL; | ||
97 | } | ||
93 | if (NULL != q) | 98 | if (NULL != q) |
94 | { | 99 | { |
95 | GNUNET_REVOCATION_query_cancel (q); | 100 | GNUNET_REVOCATION_query_cancel (q); |
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am index 11a937378..0bdc76e3e 100644 --- a/src/scalarproduct/Makefile.am +++ b/src/scalarproduct/Makefile.am | |||
@@ -29,6 +29,7 @@ gnunet_scalarproduct_SOURCES = \ | |||
29 | gnunet_scalarproduct_LDADD = \ | 29 | gnunet_scalarproduct_LDADD = \ |
30 | $(top_builddir)/src/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/util/libgnunetutil.la \ |
31 | $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ | 31 | $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \ |
32 | $(LIBGCRYPT_LIBS) \ | ||
32 | -lgcrypt \ | 33 | -lgcrypt \ |
33 | $(GN_LIBINTL) | 34 | $(GN_LIBINTL) |
34 | gnunet_scalarproduct_DEPENDENCIES = \ | 35 | gnunet_scalarproduct_DEPENDENCIES = \ |
@@ -40,6 +41,7 @@ gnunet_service_scalarproduct_LDADD = \ | |||
40 | $(top_builddir)/src/util/libgnunetutil.la \ | 41 | $(top_builddir)/src/util/libgnunetutil.la \ |
41 | $(top_builddir)/src/mesh/libgnunetmesh.la \ | 42 | $(top_builddir)/src/mesh/libgnunetmesh.la \ |
42 | $(top_builddir)/src/set/libgnunetset.la \ | 43 | $(top_builddir)/src/set/libgnunetset.la \ |
44 | $(LIBGCRYPT_LIBS) \ | ||
43 | -lgcrypt \ | 45 | -lgcrypt \ |
44 | $(GN_LIBINTL) | 46 | $(GN_LIBINTL) |
45 | 47 | ||
@@ -49,6 +51,7 @@ libgnunetscalarproduct_la_SOURCES = \ | |||
49 | libgnunetscalarproduct_la_LIBADD = \ | 51 | libgnunetscalarproduct_la_LIBADD = \ |
50 | $(top_builddir)/src/util/libgnunetutil.la \ | 52 | $(top_builddir)/src/util/libgnunetutil.la \ |
51 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 53 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
54 | $(LIBGCRYPT_LIBS) \ | ||
52 | -lgcrypt \ | 55 | -lgcrypt \ |
53 | $(LTLIBINTL) | 56 | $(LTLIBINTL) |
54 | libgnunetscalarproduct_la_LDFLAGS = \ | 57 | libgnunetscalarproduct_la_LDFLAGS = \ |