[GNUnet-SVN] r29309 - in gnunet/src: datacache datastore gns hostlist transport

[gnunet]

Author: grothoff
Date: 2013-09-16 14:54:32 +0200 (Mon, 16 Sep 2013)
New Revision: 29309

Modified:
   gnunet/src/datacache/Makefile.am
   gnunet/src/datastore/Makefile.am
   gnunet/src/gns/Makefile.am
   gnunet/src/hostlist/Makefile.am
   gnunet/src/transport/Makefile.am
Log:
-ftbfs

Modified: gnunet/src/datacache/Makefile.am
===================================================================
--- gnunet/src/datacache/Makefile.am    2013-09-16 12:38:51 UTC (rev 29308)
+++ gnunet/src/datacache/Makefile.am    2013-09-16 12:54:32 UTC (rev 29309)
@@ -70,7 +70,7 @@
   $(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
 

Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am    2013-09-16 12:38:51 UTC (rev 29308)
+++ gnunet/src/datastore/Makefile.am    2013-09-16 12:54:32 UTC (rev 29309)
@@ -137,7 +137,7 @@
 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_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 = \

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2013-09-16 12:38:51 UTC (rev 29308)
+++ gnunet/src/gns/Makefile.am  2013-09-16 12:54:32 UTC (rev 29309)
@@ -49,7 +49,7 @@
 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 @@
   $(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

Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am     2013-09-16 12:38:51 UTC (rev 29308)
+++ gnunet/src/hostlist/Makefile.am     2013-09-16 12:54:32 UTC (rev 29309)
@@ -38,7 +38,7 @@
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@ 
+ @LIBCURL_CPPFLAGS@  $(AM_CPPFLAGS)
 
 if HAVE_LIBCURL
 check_PROGRAMS = \

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2013-09-16 12:38:51 UTC (rev 29308)
+++ gnunet/src/transport/Makefile.am    2013-09-16 12:54:32 UTC (rev 29309)
@@ -302,7 +302,7 @@
 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_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS 
 libgnunet_plugin_transport_https_client_la_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
+ @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS)
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \