5 files changed, 16 insertions, 15 deletions

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index fe8787b17..97ffabb87 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -70,7 +70,7 @@ libgnunet_plugin_datacache_postgres_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq
 libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \
- $(POSTGRES_CPPFLAGS)
+ $(POSTGRES_CPPFLAGS) $(AM_CPPFLAGS)
 libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq
 
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index 107aaa1bb..5522b0295 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -137,7 +137,7 @@ libgnunet_plugin_datastore_mysql_la_LIBADD = \
 libgnunet_plugin_datastore_mysql_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
 libgnunet_plugin_datastore_mysql_la_CPPFLAGS = \
- $(MYSQL_CPPFLAGS)
+ $(MYSQL_CPPFLAGS) $(AM_CPPFLAGS)
 
 libgnunet_plugin_datastore_postgres_la_SOURCES = \
   plugin_datastore_postgres.c
@@ -148,7 +148,7 @@ libgnunet_plugin_datastore_postgres_la_LIBADD = \
 libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRES_LDFLAGS) -lpq
 libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \
- $(POSTGRES_CPPFLAGS)
+ $(POSTGRES_CPPFLAGS) $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_datastore_template_la_SOURCES = \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 2fcbd821a..ed3d57e5e 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -49,7 +49,7 @@ if HAVE_GNUTLS
 if HAVE_LIBCURL
 # does not compile right now...
 if HAVE_EXPERIMENTAL
-# DO_PROXY=gnunet-gns-proxy
+ DO_PROXY=gnunet-gns-proxy
 endif
 endif
 endif
@@ -100,14 +100,15 @@ gnunet_dns2gns_DEPENDENCIES = \
   $(top_builddir)/src/dns/libgnunetdnsstub.la \
   libgnunetgns.la
 
-#gnunet_gns_proxy_SOURCES = \
-# gnunet-gns-proxy.c gns_proxy_proto.h 
-#gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \
-#  $(top_builddir)/src/gns/libgnunetgns.la \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
-#gnunet_gns_proxy_DEPENDENCIES = \
-#  libgnunetgns.la
+gnunet_gns_proxy_SOURCES = \
+ gnunet-gns-proxy.c gns_proxy_proto.h 
+gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_gns_proxy_DEPENDENCIES = \
+  libgnunetgns.la
 
 gnunet_gns_helper_service_w32_SOURCES = \
   gnunet-gns-helper-service-w32.c
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 560d4f0f2..38c065cbf 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -38,7 +38,7 @@ gnunet_daemon_hostlist_LDADD = \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@ 
+ @LIBCURL_CPPFLAGS@  $(AM_CPPFLAGS)
 
 if HAVE_LIBCURL
 check_PROGRAMS = \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 9ea9209ea..9bc58bf04 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -302,7 +302,7 @@ libgnunet_plugin_transport_http_client_la_LDFLAGS = \
 libgnunet_plugin_transport_http_client_la_CFLAGS = \
  $(CFLAGS) 
 libgnunet_plugin_transport_http_client_la_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
+ @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
@@ -333,7 +333,7 @@ libgnunet_plugin_transport_https_client_la_LDFLAGS = \
 libgnunet_plugin_transport_https_client_la_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS 
 libgnunet_plugin_transport_https_client_la_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
+ @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \