[GNUnet-SVN] r36939 - in gnunet: . po src/identity-provider src/include src/json

[gnunet]

Author: grothoff
Date: 2016-03-17 20:32:28 +0100 (Thu, 17 Mar 2016)
New Revision: 36939

Modified:
   gnunet/configure.ac
   gnunet/po/POTFILES.in
   gnunet/src/identity-provider/Makefile.am
   gnunet/src/include/gnunet_json_lib.h
   gnunet/src/json/Makefile.am
Log:
-fix build issues

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2016-03-17 19:24:35 UTC (rev 36938)
+++ gnunet/configure.ac 2016-03-17 19:32:28 UTC (rev 36939)
@@ -968,6 +968,8 @@
 
 AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1])
 
+AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
+
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -1550,6 +1552,7 @@
 src/identity/identity.conf
 src/include/Makefile
 src/integration-tests/Makefile
+src/json/Makefile
 src/hostlist/Makefile
 src/multicast/Makefile
 src/multicast/multicast.conf

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2016-03-17 19:24:35 UTC (rev 36938)
+++ gnunet/po/POTFILES.in       2016-03-17 19:32:28 UTC (rev 36939)
@@ -209,6 +209,9 @@
 src/identity-provider/identity_provider_api.c
 src/identity-provider/identity_token.c
 src/identity-provider/plugin_rest_identity_provider.c
+src/json/json.c
+src/json/json_generator.c
+src/json/json_helper.c
 src/multicast/gnunet-multicast.c
 src/multicast/gnunet-service-multicast.c
 src/multicast/multicast_api.c

Modified: gnunet/src/identity-provider/Makefile.am
===================================================================
--- gnunet/src/identity-provider/Makefile.am    2016-03-17 19:24:35 UTC (rev 
36938)
+++ gnunet/src/identity-provider/Makefile.am    2016-03-17 19:32:28 UTC (rev 
36939)
@@ -4,7 +4,7 @@
  plugindir = $(libdir)/gnunet
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -21,7 +21,7 @@
 
 plugin_LTLIBRARIES = \
   libgnunetidentityprovider.la \
-       libgnunet_plugin_rest_identity_provider.la 
+       libgnunet_plugin_rest_identity_provider.la
 
 bin_PROGRAMS = \
  gnunet-identity-token
@@ -37,6 +37,7 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/gns/libgnunetgns.la \
  $(GN_LIBINTL) \
  -ljansson
@@ -65,10 +66,8 @@
 
 
 gnunet_identity_token_SOURCES = \
- gnunet-identity-token.c         
+ gnunet-identity-token.c
 gnunet_identity_token_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   -ljansson -lmicrohttpd \
   $(GN_LIBINTL)
-
-

Modified: gnunet/src/include/gnunet_json_lib.h
===================================================================
--- gnunet/src/include/gnunet_json_lib.h        2016-03-17 19:24:35 UTC (rev 
36938)
+++ gnunet/src/include/gnunet_json_lib.h        2016-03-17 19:32:28 UTC (rev 
36939)
@@ -20,7 +20,9 @@
  * @author Benedikt Mueller
  * @author Christian Grothoff
  */
-#include "platform.h"
+#ifndef GNUNET_JSON_LIB_H
+#define GNUNET_JSON_LIB_H
+
 #include <gnunet/gnunet_util_lib.h>
 #include <jansson.h>
 
@@ -349,6 +351,6 @@
 GNUNET_JSON_from_rsa_signature (const struct GNUNET_CRYPTO_rsa_Signature *sig);
 
 
+#endif
 
-
 /* end of gnunet_json_lib.h */

Modified: gnunet/src/json/Makefile.am
===================================================================
--- gnunet/src/json/Makefile.am 2016-03-17 19:24:35 UTC (rev 36938)
+++ gnunet/src/json/Makefile.am 2016-03-17 19:32:28 UTC (rev 36939)
@@ -17,7 +17,7 @@
   json_generator.c \
   json_helper.c
 libgnunetjson_la_LIBADD = \
-  -lgnunetutil \
+  $(top_builddir)/src/util/libgnunetutil.la \
   -ljansson \
   $(XLIB)