diff options
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | po/POTFILES.in | 3 | ||||
-rw-r--r-- | src/identity-provider/Makefile.am | 9 | ||||
-rw-r--r-- | src/include/gnunet_json_lib.h | 6 | ||||
-rw-r--r-- | src/json/Makefile.am | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 5f90eaabc..ea9bfaa99 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -968,6 +968,8 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) | |||
968 | 968 | ||
969 | AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1]) | 969 | AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1]) |
970 | 970 | ||
971 | AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) | ||
972 | |||
971 | # restore LIBS | 973 | # restore LIBS |
972 | LIBS=$SAVE_LIBS | 974 | LIBS=$SAVE_LIBS |
973 | 975 | ||
@@ -1550,6 +1552,7 @@ src/identity/Makefile | |||
1550 | src/identity/identity.conf | 1552 | src/identity/identity.conf |
1551 | src/include/Makefile | 1553 | src/include/Makefile |
1552 | src/integration-tests/Makefile | 1554 | src/integration-tests/Makefile |
1555 | src/json/Makefile | ||
1553 | src/hostlist/Makefile | 1556 | src/hostlist/Makefile |
1554 | src/multicast/Makefile | 1557 | src/multicast/Makefile |
1555 | src/multicast/multicast.conf | 1558 | src/multicast/multicast.conf |
diff --git a/po/POTFILES.in b/po/POTFILES.in index c4665a775..103ae8c47 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -209,6 +209,9 @@ src/identity-provider/gnunet-service-identity-provider.c | |||
209 | src/identity-provider/identity_provider_api.c | 209 | src/identity-provider/identity_provider_api.c |
210 | src/identity-provider/identity_token.c | 210 | src/identity-provider/identity_token.c |
211 | src/identity-provider/plugin_rest_identity_provider.c | 211 | src/identity-provider/plugin_rest_identity_provider.c |
212 | src/json/json.c | ||
213 | src/json/json_generator.c | ||
214 | src/json/json_helper.c | ||
212 | src/multicast/gnunet-multicast.c | 215 | src/multicast/gnunet-multicast.c |
213 | src/multicast/gnunet-service-multicast.c | 216 | src/multicast/gnunet-service-multicast.c |
214 | src/multicast/multicast_api.c | 217 | src/multicast/multicast_api.c |
diff --git a/src/identity-provider/Makefile.am b/src/identity-provider/Makefile.am index f556052cb..1e0b82528 100644 --- a/src/identity-provider/Makefile.am +++ b/src/identity-provider/Makefile.am | |||
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include | |||
4 | plugindir = $(libdir)/gnunet | 4 | plugindir = $(libdir)/gnunet |
5 | 5 | ||
6 | if MINGW | 6 | if MINGW |
7 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 7 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
8 | endif | 8 | endif |
9 | 9 | ||
10 | if USE_COVERAGE | 10 | if USE_COVERAGE |
@@ -21,7 +21,7 @@ pkgcfg_DATA = \ | |||
21 | 21 | ||
22 | plugin_LTLIBRARIES = \ | 22 | plugin_LTLIBRARIES = \ |
23 | libgnunetidentityprovider.la \ | 23 | libgnunetidentityprovider.la \ |
24 | libgnunet_plugin_rest_identity_provider.la | 24 | libgnunet_plugin_rest_identity_provider.la |
25 | 25 | ||
26 | bin_PROGRAMS = \ | 26 | bin_PROGRAMS = \ |
27 | gnunet-identity-token | 27 | gnunet-identity-token |
@@ -37,6 +37,7 @@ gnunet_service_identity_provider_LDADD = \ | |||
37 | $(top_builddir)/src/util/libgnunetutil.la \ | 37 | $(top_builddir)/src/util/libgnunetutil.la \ |
38 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 38 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
39 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 39 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
40 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
40 | $(top_builddir)/src/gns/libgnunetgns.la \ | 41 | $(top_builddir)/src/gns/libgnunetgns.la \ |
41 | $(GN_LIBINTL) \ | 42 | $(GN_LIBINTL) \ |
42 | -ljansson | 43 | -ljansson |
@@ -65,10 +66,8 @@ libgnunet_plugin_rest_identity_provider_la_LDFLAGS = \ | |||
65 | 66 | ||
66 | 67 | ||
67 | gnunet_identity_token_SOURCES = \ | 68 | gnunet_identity_token_SOURCES = \ |
68 | gnunet-identity-token.c | 69 | gnunet-identity-token.c |
69 | gnunet_identity_token_LDADD = \ | 70 | gnunet_identity_token_LDADD = \ |
70 | $(top_builddir)/src/util/libgnunetutil.la \ | 71 | $(top_builddir)/src/util/libgnunetutil.la \ |
71 | -ljansson -lmicrohttpd \ | 72 | -ljansson -lmicrohttpd \ |
72 | $(GN_LIBINTL) | 73 | $(GN_LIBINTL) |
73 | |||
74 | |||
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index e39938858..8d8a6ee78 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h | |||
@@ -20,7 +20,9 @@ | |||
20 | * @author Benedikt Mueller | 20 | * @author Benedikt Mueller |
21 | * @author Christian Grothoff | 21 | * @author Christian Grothoff |
22 | */ | 22 | */ |
23 | #include "platform.h" | 23 | #ifndef GNUNET_JSON_LIB_H |
24 | #define GNUNET_JSON_LIB_H | ||
25 | |||
24 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
25 | #include <jansson.h> | 27 | #include <jansson.h> |
26 | 28 | ||
@@ -349,6 +351,6 @@ json_t * | |||
349 | GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *sig); | 351 | GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *sig); |
350 | 352 | ||
351 | 353 | ||
352 | 354 | #endif | |
353 | 355 | ||
354 | /* end of gnunet_json_lib.h */ | 356 | /* end of gnunet_json_lib.h */ |
diff --git a/src/json/Makefile.am b/src/json/Makefile.am index 83cd6dd2d..104fbe06e 100644 --- a/src/json/Makefile.am +++ b/src/json/Makefile.am | |||
@@ -17,7 +17,7 @@ libgnunetjson_la_SOURCES = \ | |||
17 | json_generator.c \ | 17 | json_generator.c \ |
18 | json_helper.c | 18 | json_helper.c |
19 | libgnunetjson_la_LIBADD = \ | 19 | libgnunetjson_la_LIBADD = \ |
20 | -lgnunetutil \ | 20 | $(top_builddir)/src/util/libgnunetutil.la \ |
21 | -ljansson \ | 21 | -ljansson \ |
22 | $(XLIB) | 22 | $(XLIB) |
23 | 23 | ||