social: put the sock in the right cupboard

[oweals/gnunet.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f38dd19d3614caf669172c9be24fa343d9fb6da3..39731b288ec559a92a57a5b8b40a8c185f2e981b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,14 +16,24 @@ if HAVE_EXPERIMENTAL
   rps \
   $(CONSENSUS) \
   $(SECRETSHARING)
+
 endif
 
-if HAVE_REST
+if HAVE_JSON
+if HAVE_MHD
   PROVIDER_DIR = identity-provider
 endif
+endif
 
 if HAVE_JSON
   JSON_DIR = json
+if HAVE_LIBGNURL
+  JSON_DIR += curl
+else
+if HAVE_LIBCURL
+  JSON_DIR += curl
+endif
+endif
 endif
 
 if BUILD_PULSE_HELPERS
@@ -35,15 +45,18 @@ endif
 endif
 
 if HAVE_MYSQL
- MYSQL_DIR = mysql
+ MYSQL_DIR = mysql my
 endif
 
 if HAVE_POSTGRESQL
  POSTGRES_DIR = pq postgres
 endif
 
-if HAVE_REST
+if HAVE_MHD
  REST_DIR = rest
+if HAVE_JSON
+ JSONAPI_DIR = jsonapi
+endif
 endif
 
 if TALER_ONLY
@@ -57,6 +70,7 @@ SUBDIRS = \
   util \
   $(JSON_DIR) \
   $(REST_DIR) \
+       $(JSONAPI_DIR) \
   hello \
   tun \
   block \