fix bootstrap

diff --git a/configure.ac b/configure.ac
index e55ca6ffaa2378941b0987e515a0f31de618fad6..0abfb40b4304382c4b585be2ca2a88a91257e851 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1819,7 +1819,6 @@ src/vpn/vpn.conf
 src/zonemaster/Makefile
 src/zonemaster/zonemaster.conf
 src/rest/Makefile
-src/rest-plugins/Makefile
 src/abe/Makefile
 src/reclaim-attribute/Makefile
 src/reclaim/Makefile

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7307f9c0a215d086980047b6a1be67c914128391..87a597c500d39238d7d0063922c757236da7ecbe 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,6 +92,7 @@ src/credential/credential_serialization.c
 src/credential/gnunet-credential.c
 src/credential/gnunet-service-credential.c
 src/credential/plugin_gnsrecord_credential.c
+src/credential/plugin_rest_credential.c
 src/curl/curl.c
 src/curl/curl_reschedule.c
 src/datacache/datacache.c
@@ -187,6 +188,7 @@ src/gns/nss/nss_gns.c
 src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
 src/gns/plugin_gnsrecord_gns.c
+src/gns/plugin_rest_gns.c
 src/gns/w32nsp-install.c
 src/gns/w32nsp-resolve.c
 src/gns/w32nsp-uninstall.c
@@ -207,6 +209,7 @@ src/identity/gnunet-identity.c
 src/identity/gnunet-service-identity.c
 src/identity/identity_api.c
 src/identity/identity_api_lookup.c
+src/identity/plugin_rest_identity.c
 src/json/json.c
 src/json/json_generator.c
 src/json/json_gnsrecord.c
@@ -231,6 +234,7 @@ src/namestore/namestore_api_monitor.c
 src/namestore/plugin_namestore_heap.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
+src/namestore/plugin_rest_namestore.c
 src/nat-auto/gnunet-nat-auto.c
 src/nat-auto/gnunet-nat-auto_legacy.c
 src/nat-auto/gnunet-nat-server.c
@@ -260,6 +264,7 @@ src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/peerinfo/gnunet-service-peerinfo.c
 src/peerinfo/peerinfo_api.c
 src/peerinfo/peerinfo_api_notify.c
+src/peerinfo/plugin_rest_peerinfo.c
 src/peerstore/gnunet-peerstore.c
 src/peerstore/gnunet-service-peerstore.c
 src/peerstore/peerstore_api.c
@@ -299,12 +304,6 @@ src/regex/regex_internal_dht.c
 src/regex/regex_test_graph.c
 src/regex/regex_test_lib.c
 src/regex/regex_test_random.c
-src/rest-plugins/plugin_rest_copying.c
-src/rest-plugins/plugin_rest_credential.c
-src/rest-plugins/plugin_rest_gns.c
-src/rest-plugins/plugin_rest_identity.c
-src/rest-plugins/plugin_rest_namestore.c
-src/rest-plugins/plugin_rest_peerinfo.c
 src/rest/gnunet-rest-server.c
 src/rest/rest.c
 src/revocation/gnunet-revocation.c
@@ -498,6 +497,7 @@ src/util/os_network.c
 src/util/os_priority.c
 src/util/peer.c
 src/util/plugin.c
+src/util/plugin_rest_copying.c
 src/util/proc_compat.c
 src/util/program.c
 src/util/regex.c

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index deb3fcf6c680e7e53e69a47970077914da6ae9b7..69424ffb9ce50e77f8f1c641eb6c87e40ad1bc3e 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -5,6 +5,8 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
+plugindir = $(libdir)/gnunet
+
 pkgcfg_DATA = \
   peerinfo.conf
 

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5b1bcfd55249fcade17769b1ab4933df0ac07455..a3531435473fac289e48871e4934a3a046545bbc 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -308,7 +308,8 @@ gnunet_uri_LDADD = \
   $(GN_LIBINTL)
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_test.la
+  libgnunet_plugin_test.la \
+  $(REST_PLUGIN)
 
 libgnunet_plugin_test_la_SOURCES = \
   test_plugin_plug.c