[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37126 - in gnunet: . src src/gns src/identity src/namestor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37126 - in gnunet: . src src/gns src/identity src/namestore src/rest |
Date: |
Thu, 5 May 2016 11:13:48 +0200 |
Author: schanzen
Date: 2016-05-05 11:13:47 +0200 (Thu, 05 May 2016)
New Revision: 37126
Modified:
gnunet/configure.ac
gnunet/src/Makefile.am
gnunet/src/gns/Makefile.am
gnunet/src/identity/Makefile.am
gnunet/src/namestore/Makefile.am
gnunet/src/rest/Makefile.am
gnunet/src/rest/rest.c
Log:
- remove HAVE_REST, remove json reference from rest
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/configure.ac 2016-05-05 09:13:47 UTC (rev 37126)
@@ -970,8 +970,6 @@
AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
-AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1])
-
AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
# restore LIBS
Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/src/Makefile.am 2016-05-05 09:13:47 UTC (rev 37126)
@@ -19,9 +19,11 @@
endif
-if HAVE_REST
+if HAVE_JSON
+if HAVE_MHD
PROVIDER_DIR = identity-provider
endif
+endif
if HAVE_JSON
JSON_DIR = json
@@ -50,7 +52,7 @@
POSTGRES_DIR = pq postgres
endif
-if HAVE_REST
+if HAVE_MHD
REST_DIR = rest
if HAVE_JSON
JSONAPI_DIR = jsonapi
Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/src/gns/Makefile.am 2016-05-05 09:13:47 UTC (rev 37126)
@@ -92,9 +92,11 @@
libgnunet_plugin_gnsrecord_gns.la
-if HAVE_REST
+if HAVE_MHD
+if HAVE_JSON
plugin_LTLIBRARIES += libgnunet_plugin_rest_gns.la
endif
+endif
libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
plugin_gnsrecord_gns.c
Modified: gnunet/src/identity/Makefile.am
===================================================================
--- gnunet/src/identity/Makefile.am 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/src/identity/Makefile.am 2016-05-05 09:13:47 UTC (rev 37126)
@@ -39,11 +39,13 @@
libexec_PROGRAMS = \
gnunet-service-identity
-if HAVE_REST
+if HAVE_MHD
+if HAVE_JSON
plugin_LTLIBRARIES = \
libgnunet_plugin_rest_identity.la \
libgnunet_plugin_gnsrecord_identity.la
endif
+endif
gnunet_service_identity_SOURCES = \
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/src/namestore/Makefile.am 2016-05-05 09:13:47 UTC (rev 37126)
@@ -71,9 +71,11 @@
$(TESTING_TESTS)
endif
-if HAVE_REST
+if HAVE_MHD
+if HAVE_JSON
REST_PLUGIN=libgnunet_plugin_rest_namestore.la
endif
+endif
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
Modified: gnunet/src/rest/Makefile.am
===================================================================
--- gnunet/src/rest/Makefile.am 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/src/rest/Makefile.am 2016-05-05 09:13:47 UTC (rev 37126)
@@ -38,7 +38,7 @@
rest.c
libgnunetrest_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
- $(GN_LIBINTL) -lmicrohttpd -ljansson
+ $(GN_LIBINTL) -lmicrohttpd
libgnunetrest_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
Modified: gnunet/src/rest/rest.c
===================================================================
--- gnunet/src/rest/rest.c 2016-05-04 17:20:54 UTC (rev 37125)
+++ gnunet/src/rest/rest.c 2016-05-05 09:13:47 UTC (rev 37126)
@@ -48,13 +48,13 @@
}
/**
- * Create JSON API MHD response
+ * Create MHD response
*
- * @param data JSON result
+ * @param data result
* @retun MHD response
*/
struct MHD_Response*
-GNUNET_REST_create_json_response (const char *data)
+GNUNET_REST_create_response (const char *data)
{
struct MHD_Response *resp;
size_t len;
@@ -69,7 +69,6 @@
resp = MHD_create_response_from_buffer (len,
(void*)data,
MHD_RESPMEM_MUST_COPY);
- MHD_add_response_header
(resp,MHD_HTTP_HEADER_CONTENT_TYPE,"application/json");
return resp;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37126 - in gnunet: . src src/gns src/identity src/namestore src/rest,
gnunet <=