diff options
-rw-r--r-- | configure.ac | 82 | ||||
-rw-r--r-- | src/auction/gnunet-auction-create.c | 2 | ||||
-rw-r--r-- | src/credential/Makefile.am | 3 | ||||
-rw-r--r-- | src/gns/Makefile.am | 13 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 10 | ||||
-rw-r--r-- | src/identity/Makefile.am | 3 | ||||
-rw-r--r-- | src/json/Makefile.am | 8 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 6 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 3 | ||||
-rw-r--r-- | src/pt/Makefile.am | 25 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 6 | ||||
-rw-r--r-- | src/rest/Makefile.am | 14 | ||||
-rw-r--r-- | src/transport/Makefile.am | 23 |
13 files changed, 76 insertions, 122 deletions
diff --git a/configure.ac b/configure.ac index 330b02875..3ddebf7a6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1262,73 +1262,23 @@ AS_IF([test "$sqlite" = 0 -a "$mysql" = 0], | |||
1262 | 1262 | ||
1263 | # libmicrohttpd | 1263 | # libmicrohttpd |
1264 | lmhd=0 | 1264 | lmhd=0 |
1265 | AC_MSG_CHECKING([for libmicrohttpd]) | 1265 | m4_define([MHD_MODULE], [libmicrohttpd >= 0.9.63]) |
1266 | AC_ARG_WITH(microhttpd, | 1266 | AC_ARG_WITH(microhttpd, |
1267 | [ --with-microhttpd=PFX base of libmicrohttpd installation], | 1267 | [AS_HELP_STRING([--with-microhttpd[[=PFX]]], |
1268 | [AC_MSG_RESULT([$with_microhttpd]) | 1268 | [base of libmicrohttpd installation])], |
1269 | AS_CASE([$with_microhttpd], | 1269 | [], |
1270 | [no],[], | 1270 | [with_microhttpd=check]) |
1271 | [yes|""],[ | 1271 | AS_CASE([$with_microhttpd], |
1272 | AC_CHECK_HEADERS([microhttpd.h], | 1272 | [no], [], |
1273 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 1273 | [yes], [PKG_CHECK_MODULES([MHD], [MHD_MODULE], [lmhd=1])], |
1274 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], | 1274 | [check], [PKG_CHECK_MODULES([MHD], [MHD_MODULE], |
1275 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.63]) | 1275 | [lmhd=1], |
1276 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([ | 1276 | [AC_MSG_WARN([Building without libmicrohttpd])])], |
1277 | #include "$native_srcdir/src/include/platform.h" | 1277 | [SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH |
1278 | #include <microhttpd.h> | 1278 | PKG_CONFIG_PATH=$with_microhttpd/lib/pkgconfig |
1279 | #if (MHD_VERSION < 0x0096300) | 1279 | export PKG_CONFIG_PATH |
1280 | #error needs at least version 0.9.63 | 1280 | PKG_CHECK_MODULES([MHD], [MHD_MODULE], [lmhd=1]) |
1281 | #endif | 1281 | PKG_CONFIG_PATH=$SAVE_PKG_CONFIG_PATH]) |
1282 | int main () { return 0; } | ||
1283 | ])], | ||
1284 | [AC_MSG_RESULT(ok) | ||
1285 | lmhd=1], | ||
1286 | [AC_MSG_RESULT(failed)])]), | ||
1287 | [],[#include "$native_srcdir/src/include/platform.h" | ||
1288 | #include <microhttpd.h>]),, | ||
1289 | [#include "$native_srcdir/src/include/platform.h"]) | ||
1290 | ],[ | ||
1291 | LDFLAGS="-L$with_microhttpd/lib $LDFLAGS" | ||
1292 | CPPFLAGS="-I$with_microhttpd/include $CPPFLAGS" | ||
1293 | AC_CHECK_HEADERS(microhttpd.h, | ||
1294 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | ||
1295 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], | ||
1296 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" | ||
1297 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.52]) | ||
1298 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([ | ||
1299 | #include "$native_srcdir/src/include/platform.h" | ||
1300 | #include <microhttpd.h> | ||
1301 | #if (MHD_VERSION < 0x0094200) | ||
1302 | #error needs at least version 0.9.42 | ||
1303 | #endif | ||
1304 | int main () { return 0; } | ||
1305 | ])], | ||
1306 | [AC_MSG_RESULT(ok) | ||
1307 | lmhd=1], | ||
1308 | [AC_MSG_RESULT(failed)])]), | ||
1309 | [],[#include "$native_srcdir/src/include/platform.h" | ||
1310 | #include <microhttpd.h>]),, | ||
1311 | [#include "$native_srcdir/src/include/platform.h"]) | ||
1312 | ]) | ||
1313 | ], | ||
1314 | [AC_MSG_RESULT([--with-microhttpd not specified]) | ||
1315 | AC_CHECK_HEADERS([microhttpd.h], | ||
1316 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | ||
1317 | AC_CHECK_LIB([microhttpd], [MHD_get_fdset2], | ||
1318 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.52]) | ||
1319 | AC_COMPILE_IFELSE([AC_LANG_SOURCE([ | ||
1320 | #include "$native_srcdir/src/include/platform.h" | ||
1321 | #include <microhttpd.h> | ||
1322 | #if (MHD_VERSION < 0x0094200) | ||
1323 | #error needs at least version 0.9.52 | ||
1324 | #endif | ||
1325 | ])], | ||
1326 | [AC_MSG_RESULT(ok) | ||
1327 | lmhd=1], | ||
1328 | [AC_MSG_RESULT(failed)])]), | ||
1329 | [],[#include "$native_srcdir/src/include/platform.h" | ||
1330 | #include <microhttpd.h>]),, | ||
1331 | [#include "$native_srcdir/src/include/platform.h"])]) | ||
1332 | AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) | 1282 | AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) |
1333 | AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) | 1283 | AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) |
1334 | 1284 | ||
diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c index a094d2a56..3ee4d3554 100644 --- a/src/auction/gnunet-auction-create.c +++ b/src/auction/gnunet-auction-create.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <float.h> | 28 | #include <float.h> |
29 | 29 | ||
30 | #include "gnunet_util_lib.h" | 30 | #include "gnunet_util_lib.h" |
31 | #include "gnunet_json_lib.h" | 31 | #include <jansson.h> |
32 | /* #include "gnunet_auction_service.h" */ | 32 | /* #include "gnunet_auction_service.h" */ |
33 | 33 | ||
34 | #define FIRST_PRICE 0 | 34 | #define FIRST_PRICE 0 |
diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am index f2550eca6..bc6c49deb 100644 --- a/src/credential/Makefile.am +++ b/src/credential/Makefile.am | |||
@@ -100,9 +100,10 @@ endif | |||
100 | # $(top_builddir)/src/rest/libgnunetrest.la \ | 100 | # $(top_builddir)/src/rest/libgnunetrest.la \ |
101 | # $(top_builddir)/src/identity/libgnunetidentity.la \ | 101 | # $(top_builddir)/src/identity/libgnunetidentity.la \ |
102 | # $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 102 | # $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
103 | # $(LTLIBINTL) -ljansson -lmicrohttpd | 103 | # $(LTLIBINTL) -ljansson $(MHD_LIBS) |
104 | #libgnunet_plugin_rest_credential_la_LDFLAGS = \ | 104 | #libgnunet_plugin_rest_credential_la_LDFLAGS = \ |
105 | # $(GN_PLUGIN_LDFLAGS) | 105 | # $(GN_PLUGIN_LDFLAGS) |
106 | #libgnunet_plugin_rest_credential_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
106 | 107 | ||
107 | 108 | ||
108 | 109 | ||
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 642172e69..0d38cb51e 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -122,9 +122,10 @@ libgnunet_plugin_rest_gns_la_LIBADD = \ | |||
122 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 122 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
123 | $(top_builddir)/src/json/libgnunetjson.la \ | 123 | $(top_builddir)/src/json/libgnunetjson.la \ |
124 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 124 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
125 | $(LTLIBINTL) -ljansson -lmicrohttpd | 125 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
126 | libgnunet_plugin_rest_gns_la_LDFLAGS = \ | 126 | libgnunet_plugin_rest_gns_la_LDFLAGS = \ |
127 | $(GN_PLUGIN_LDFLAGS) | 127 | $(GN_PLUGIN_LDFLAGS) |
128 | libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
128 | 129 | ||
129 | 130 | ||
130 | libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ | 131 | libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ |
@@ -158,7 +159,8 @@ gnunet_bcd_SOURCES = \ | |||
158 | gnunet-bcd.c | 159 | gnunet-bcd.c |
159 | gnunet_bcd_LDADD = \ | 160 | gnunet_bcd_LDADD = \ |
160 | $(top_builddir)/src/util/libgnunetutil.la \ | 161 | $(top_builddir)/src/util/libgnunetutil.la \ |
161 | $(GN_LIBINTL) -lmicrohttpd | 162 | $(GN_LIBINTL) $(MHD_LIBS) |
163 | gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
162 | 164 | ||
163 | 165 | ||
164 | gnunet_dns2gns_SOURCES = \ | 166 | gnunet_dns2gns_SOURCES = \ |
@@ -180,8 +182,7 @@ endif | |||
180 | 182 | ||
181 | gnunet_gns_proxy_SOURCES = \ | 183 | gnunet_gns_proxy_SOURCES = \ |
182 | gnunet-gns-proxy.c | 184 | gnunet-gns-proxy.c |
183 | gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL) | 185 | gnunet_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \ |
184 | gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \ | ||
185 | libgnunetgns.la \ | 186 | libgnunetgns.la \ |
186 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 187 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
187 | $(top_builddir)/src/util/libgnunetutil.la \ | 188 | $(top_builddir)/src/util/libgnunetutil.la \ |
@@ -189,12 +190,14 @@ gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \ | |||
189 | if HAVE_GNUTLS_DANE | 190 | if HAVE_GNUTLS_DANE |
190 | gnunet_gns_proxy_LDADD += -lgnutls-dane | 191 | gnunet_gns_proxy_LDADD += -lgnutls-dane |
191 | endif | 192 | endif |
193 | gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) | ||
192 | 194 | ||
193 | test_gns_proxy_SOURCES = \ | 195 | test_gns_proxy_SOURCES = \ |
194 | test_gns_proxy.c | 196 | test_gns_proxy.c |
195 | test_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \ | 197 | test_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \ |
196 | $(top_builddir)/src/util/libgnunetutil.la \ | 198 | $(top_builddir)/src/util/libgnunetutil.la \ |
197 | $(GN_LIBINTL) | 199 | $(GN_LIBINTL) |
200 | test_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) | ||
198 | 201 | ||
199 | gnunet_gns_helper_service_w32_SOURCES = \ | 202 | gnunet_gns_helper_service_w32_SOURCES = \ |
200 | gnunet-gns-helper-service-w32.c | 203 | gnunet-gns-helper-service-w32.c |
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 17f0bdfa0..a8621a2b0 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -13,7 +13,8 @@ endif | |||
13 | if HAVE_MHD | 13 | if HAVE_MHD |
14 | HOSTLIST_SERVER_SOURCES = \ | 14 | HOSTLIST_SERVER_SOURCES = \ |
15 | gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h | 15 | gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h |
16 | GN_LIBMHD = -lmicrohttpd | 16 | GN_LIBMHD = $(MHD_LIBS) |
17 | GN_CPPMHD = $(MHD_CFLAGS) | ||
17 | endif | 18 | endif |
18 | 19 | ||
19 | if HAVE_LIBGNURL | 20 | if HAVE_LIBGNURL |
@@ -50,9 +51,10 @@ gnunet_daemon_hostlist_LDADD = \ | |||
50 | $(LIB_GNURL) \ | 51 | $(LIB_GNURL) \ |
51 | $(GN_LIBINTL) | 52 | $(GN_LIBINTL) |
52 | 53 | ||
53 | gnunet_daemon_hostlist_CPPFLAGS = \ | 54 | gnunet_daemon_hostlist_CFLAGS = \ |
54 | $(CPP_GNURL) \ | 55 | $(GN_CPPMHD) \ |
55 | $(AM_CPPFLAGS) | 56 | $(CPP_GNURL) \ |
57 | $(AM_CFLAGS) | ||
56 | 58 | ||
57 | if HAVE_LIBGNURL | 59 | if HAVE_LIBGNURL |
58 | check_PROGRAMS = \ | 60 | check_PROGRAMS = \ |
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index 476d981bb..9c87ec2c0 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am | |||
@@ -35,9 +35,10 @@ libgnunet_plugin_rest_identity_la_LIBADD = \ | |||
35 | libgnunetidentity.la \ | 35 | libgnunetidentity.la \ |
36 | $(top_builddir)/src/rest/libgnunetrest.la \ | 36 | $(top_builddir)/src/rest/libgnunetrest.la \ |
37 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 37 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
38 | $(LTLIBINTL) -ljansson -lmicrohttpd | 38 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
39 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ | 39 | libgnunet_plugin_rest_identity_la_LDFLAGS = \ |
40 | $(GN_PLUGIN_LDFLAGS) | 40 | $(GN_PLUGIN_LDFLAGS) |
41 | libgnunet_plugin_rest_identity_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
41 | 42 | ||
42 | 43 | ||
43 | libgnunetidentity_la_SOURCES = \ | 44 | libgnunetidentity_la_SOURCES = \ |
diff --git a/src/json/Makefile.am b/src/json/Makefile.am index dfe185d5e..886c0691d 100644 --- a/src/json/Makefile.am +++ b/src/json/Makefile.am | |||
@@ -12,6 +12,7 @@ lib_LTLIBRARIES = \ | |||
12 | libgnunetjson_la_LDFLAGS = \ | 12 | libgnunetjson_la_LDFLAGS = \ |
13 | -version-info 0:0:0 \ | 13 | -version-info 0:0:0 \ |
14 | -no-undefined | 14 | -no-undefined |
15 | libgnunetjson_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
15 | libgnunetjson_la_SOURCES = \ | 16 | libgnunetjson_la_SOURCES = \ |
16 | json.c \ | 17 | json.c \ |
17 | json_mhd.c \ | 18 | json_mhd.c \ |
@@ -22,7 +23,7 @@ libgnunetjson_la_LIBADD = \ | |||
22 | $(top_builddir)/src/util/libgnunetutil.la \ | 23 | $(top_builddir)/src/util/libgnunetutil.la \ |
23 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 24 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
24 | -ljansson \ | 25 | -ljansson \ |
25 | -lmicrohttpd \ | 26 | $(MHD_LIBS) \ |
26 | $(XLIB) \ | 27 | $(XLIB) \ |
27 | $(Z_LIBS) | 28 | $(Z_LIBS) |
28 | 29 | ||
@@ -58,8 +59,7 @@ test_json_mhd_LDADD = \ | |||
58 | libgnunetjson.la \ | 59 | libgnunetjson.la \ |
59 | $(top_builddir)/src/util/libgnunetutil.la \ | 60 | $(top_builddir)/src/util/libgnunetutil.la \ |
60 | -ljansson \ | 61 | -ljansson \ |
61 | -lmicrohttpd \ | 62 | $(MHD_LIBS) \ |
62 | $(Z_LIBS) \ | 63 | $(Z_LIBS) \ |
63 | $(LIB_GNURL) | 64 | $(LIB_GNURL) |
64 | test_json_mhd_CPPFLAGS = \ | 65 | test_json_mhd_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
65 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index e95add6c7..ad99a3f0b 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -143,9 +143,10 @@ libgnunet_plugin_rest_namestore_la_LIBADD = \ | |||
143 | $(top_builddir)/src/json/libgnunetjson.la \ | 143 | $(top_builddir)/src/json/libgnunetjson.la \ |
144 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 144 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
145 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 145 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
146 | $(LTLIBINTL) -ljansson -lmicrohttpd | 146 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
147 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ | 147 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ |
148 | $(GN_PLUGIN_LDFLAGS) | 148 | $(GN_PLUGIN_LDFLAGS) |
149 | libgnunet_plugin_rest_namestore_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
149 | 150 | ||
150 | 151 | ||
151 | libgnunetnamestore_la_SOURCES = \ | 152 | libgnunetnamestore_la_SOURCES = \ |
@@ -185,12 +186,13 @@ gnunet_namestore_LDADD = \ | |||
185 | 186 | ||
186 | gnunet_namestore_fcfsd_SOURCES = \ | 187 | gnunet_namestore_fcfsd_SOURCES = \ |
187 | gnunet-namestore-fcfsd.c | 188 | gnunet-namestore-fcfsd.c |
188 | gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \ | 189 | gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \ |
189 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 190 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
190 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 191 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
191 | libgnunetnamestore.la \ | 192 | libgnunetnamestore.la \ |
192 | $(top_builddir)/src/util/libgnunetutil.la \ | 193 | $(top_builddir)/src/util/libgnunetutil.la \ |
193 | $(GN_LIBINTL) | 194 | $(GN_LIBINTL) |
195 | gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
194 | 196 | ||
195 | 197 | ||
196 | gnunet_service_namestore_SOURCES = \ | 198 | gnunet_service_namestore_SOURCES = \ |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index a5fd60246..8293288c8 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -32,9 +32,10 @@ libgnunet_plugin_rest_peerinfo_la_LIBADD = \ | |||
32 | $(top_builddir)/src/rest/libgnunetrest.la \ | 32 | $(top_builddir)/src/rest/libgnunetrest.la \ |
33 | $(top_builddir)/src/json/libgnunetjson.la \ | 33 | $(top_builddir)/src/json/libgnunetjson.la \ |
34 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 34 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
35 | $(LTLIBINTL) -ljansson -lmicrohttpd | 35 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
36 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ | 36 | libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \ |
37 | $(GN_PLUGIN_LDFLAGS) | 37 | $(GN_PLUGIN_LDFLAGS) |
38 | libgnunet_plugin_rest_peerinfo_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
38 | 39 | ||
39 | 40 | ||
40 | gnunet_peerinfo_SOURCES = \ | 41 | gnunet_peerinfo_SOURCES = \ |
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 188387c0c..1d94a3429 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -93,47 +93,42 @@ EXTRA_DIST = \ | |||
93 | 93 | ||
94 | test_gns_vpn_SOURCES = \ | 94 | test_gns_vpn_SOURCES = \ |
95 | test_gns_vpn.c | 95 | test_gns_vpn.c |
96 | test_gns_vpn_LDADD = -lmicrohttpd $(LIB_GNURL) \ | 96 | test_gns_vpn_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ |
97 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 97 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
98 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 98 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
99 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 99 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
100 | $(top_builddir)/src/testing/libgnunettesting.la \ | 100 | $(top_builddir)/src/testing/libgnunettesting.la \ |
101 | $(top_builddir)/src/util/libgnunetutil.la | 101 | $(top_builddir)/src/util/libgnunetutil.la |
102 | test_gns_vpn_CPPFLAGS = \ | 102 | test_gns_vpn_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
103 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
104 | 103 | ||
105 | test_gnunet_vpn_4_over_SOURCES = \ | 104 | test_gnunet_vpn_4_over_SOURCES = \ |
106 | test_gnunet_vpn.c | 105 | test_gnunet_vpn.c |
107 | test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ | 106 | test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ |
108 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 107 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
109 | $(top_builddir)/src/testing/libgnunettesting.la \ | 108 | $(top_builddir)/src/testing/libgnunettesting.la \ |
110 | $(top_builddir)/src/util/libgnunetutil.la | 109 | $(top_builddir)/src/util/libgnunetutil.la |
111 | test_gnunet_vpn_4_over_CPPFLAGS = \ | 110 | test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
112 | $(LIB_GNURL) $(AM_CPPFLAGS) | ||
113 | 111 | ||
114 | test_gnunet_vpn_6_over_SOURCES = \ | 112 | test_gnunet_vpn_6_over_SOURCES = \ |
115 | test_gnunet_vpn.c | 113 | test_gnunet_vpn.c |
116 | test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ | 114 | test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ |
117 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 115 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
118 | $(top_builddir)/src/testing/libgnunettesting.la \ | 116 | $(top_builddir)/src/testing/libgnunettesting.la \ |
119 | $(top_builddir)/src/util/libgnunetutil.la | 117 | $(top_builddir)/src/util/libgnunetutil.la |
120 | test_gnunet_vpn_6_over_CPPFLAGS = \ | 118 | test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
121 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
122 | 119 | ||
123 | test_gnunet_vpn_4_to_6_SOURCES = \ | 120 | test_gnunet_vpn_4_to_6_SOURCES = \ |
124 | test_gnunet_vpn.c | 121 | test_gnunet_vpn.c |
125 | test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIB_GNURL) \ | 122 | test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ |
126 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 123 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
127 | $(top_builddir)/src/testing/libgnunettesting.la \ | 124 | $(top_builddir)/src/testing/libgnunettesting.la \ |
128 | $(top_builddir)/src/util/libgnunetutil.la | 125 | $(top_builddir)/src/util/libgnunetutil.la |
129 | test_gnunet_vpn_4_to_6_CPPFLAGS = \ | 126 | test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
130 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
131 | 127 | ||
132 | test_gnunet_vpn_6_to_4_SOURCES = \ | 128 | test_gnunet_vpn_6_to_4_SOURCES = \ |
133 | test_gnunet_vpn.c | 129 | test_gnunet_vpn.c |
134 | test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIB_GNURL) \ | 130 | test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) $(LIB_GNURL) \ |
135 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 131 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
136 | $(top_builddir)/src/testing/libgnunettesting.la \ | 132 | $(top_builddir)/src/testing/libgnunettesting.la \ |
137 | $(top_builddir)/src/util/libgnunetutil.la | 133 | $(top_builddir)/src/util/libgnunetutil.la |
138 | test_gnunet_vpn_6_to_4_CPPFLAGS = \ | 134 | test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) |
139 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 6e5046437..6937b1af6 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am | |||
@@ -58,9 +58,10 @@ libgnunet_plugin_rest_reclaim_la_LIBADD = \ | |||
58 | $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ | 58 | $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ |
59 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 59 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
60 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 60 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
61 | $(LTLIBINTL) -ljansson -lmicrohttpd | 61 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
62 | libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ | 62 | libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ |
63 | $(GN_PLUGIN_LDFLAGS) | 63 | $(GN_PLUGIN_LDFLAGS) |
64 | libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
64 | 65 | ||
65 | 66 | ||
66 | libgnunet_plugin_rest_openid_connect_la_SOURCES = \ | 67 | libgnunet_plugin_rest_openid_connect_la_SOURCES = \ |
@@ -76,9 +77,10 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \ | |||
76 | $(top_builddir)/src/gns/libgnunetgns.la \ | 77 | $(top_builddir)/src/gns/libgnunetgns.la \ |
77 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 78 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
78 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 79 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
79 | $(LTLIBINTL) -ljansson -lmicrohttpd | 80 | $(LTLIBINTL) -ljansson $(MHD_LIBS) |
80 | libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ | 81 | libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ |
81 | $(GN_PLUGIN_LDFLAGS) | 82 | $(GN_PLUGIN_LDFLAGS) |
83 | libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
82 | 84 | ||
83 | 85 | ||
84 | libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \ | 86 | libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \ |
diff --git a/src/rest/Makefile.am b/src/rest/Makefile.am index 8fe48198f..1fd2816c0 100644 --- a/src/rest/Makefile.am +++ b/src/rest/Makefile.am | |||
@@ -37,34 +37,36 @@ libgnunet_plugin_rest_copying_la_SOURCES = \ | |||
37 | libgnunet_plugin_rest_copying_la_LIBADD = \ | 37 | libgnunet_plugin_rest_copying_la_LIBADD = \ |
38 | libgnunetrest.la \ | 38 | libgnunetrest.la \ |
39 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 39 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
40 | $(LTLIBINTL) -lmicrohttpd | 40 | $(LTLIBINTL) $(MHD_LIBS) |
41 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ | 41 | libgnunet_plugin_rest_copying_la_LDFLAGS = \ |
42 | $(GN_PLUGIN_LDFLAGS) | 42 | $(GN_PLUGIN_LDFLAGS) |
43 | libgnunet_plugin_rest_copying_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
43 | 44 | ||
44 | libgnunet_plugin_rest_config_la_SOURCES = \ | 45 | libgnunet_plugin_rest_config_la_SOURCES = \ |
45 | plugin_rest_config.c | 46 | plugin_rest_config.c |
46 | libgnunet_plugin_rest_config_la_LIBADD = \ | 47 | libgnunet_plugin_rest_config_la_LIBADD = \ |
47 | libgnunetrest.la \ | 48 | libgnunetrest.la \ |
48 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | 49 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ |
49 | $(LTLIBINTL) -lmicrohttpd -ljansson | 50 | $(LTLIBINTL) $(MHD_LIBS) -ljansson |
50 | libgnunet_plugin_rest_config_la_LDFLAGS = \ | 51 | libgnunet_plugin_rest_config_la_LDFLAGS = \ |
51 | $(GN_PLUGIN_LDFLAGS) | 52 | $(GN_PLUGIN_LDFLAGS) |
53 | libgnunet_plugin_rest_config_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
52 | 54 | ||
53 | 55 | ||
54 | 56 | ||
55 | gnunet_rest_server_SOURCES = \ | 57 | gnunet_rest_server_SOURCES = \ |
56 | gnunet-rest-server.c | 58 | gnunet-rest-server.c |
57 | |||
58 | gnunet_rest_server_LDADD = \ | 59 | gnunet_rest_server_LDADD = \ |
59 | $(top_builddir)/src/util/libgnunetutil.la \ | 60 | $(top_builddir)/src/util/libgnunetutil.la \ |
60 | $(GN_LIBINTL) -lmicrohttpd | 61 | $(GN_LIBINTL) $(MHD_LIBS) |
62 | gnunet_rest_server_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | ||
61 | 63 | ||
62 | libgnunetrest_la_SOURCES = \ | 64 | libgnunetrest_la_SOURCES = \ |
63 | rest.c | 65 | rest.c |
64 | libgnunetrest_la_LIBADD = \ | 66 | libgnunetrest_la_LIBADD = \ |
65 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \ | 67 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \ |
66 | $(GN_LIBINTL) -lmicrohttpd | 68 | $(GN_LIBINTL) $(MHD_LIBS) |
67 | libgnunetrest_la_LDFLAGS = \ | 69 | libgnunetrest_la_LDFLAGS = \ |
68 | $(GN_LIB_LDFLAGS) \ | 70 | $(GN_LIB_LDFLAGS) \ |
69 | -version-info 0:0:0 | 71 | -version-info 0:0:0 |
70 | 72 | libgnunetrest_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS) | |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index e6729f2a9..a9b0d19d6 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -12,7 +12,6 @@ pkgcfg_DATA = \ | |||
12 | communicator-unix.conf | 12 | communicator-unix.conf |
13 | 13 | ||
14 | if HAVE_MHD | 14 | if HAVE_MHD |
15 | GN_LIBMHD = -lmicrohttpd | ||
16 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la | 15 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la |
17 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la | 16 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la |
18 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server | 17 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server |
@@ -369,7 +368,7 @@ gnunet_service_transport_LDADD = \ | |||
369 | $(GN_GLPK) \ | 368 | $(GN_GLPK) \ |
370 | $(GN_LIBINTL) | 369 | $(GN_LIBINTL) |
371 | gnunet_service_transport_CFLAGS = \ | 370 | gnunet_service_transport_CFLAGS = \ |
372 | $(CFLAGS) | 371 | $(AM_CFLAGS) |
373 | # -DANALYZE | 372 | # -DANALYZE |
374 | 373 | ||
375 | 374 | ||
@@ -430,7 +429,7 @@ libgnunet_plugin_transport_wlan_la_LIBADD = \ | |||
430 | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ | 429 | libgnunet_plugin_transport_wlan_la_LDFLAGS = \ |
431 | $(GN_PLUGIN_LDFLAGS) | 430 | $(GN_PLUGIN_LDFLAGS) |
432 | libgnunet_plugin_transport_wlan_la_CFLAGS = \ | 431 | libgnunet_plugin_transport_wlan_la_CFLAGS = \ |
433 | $(CFLAGS) -DBUILD_WLAN | 432 | $(AM_CFLAGS) -DBUILD_WLAN |
434 | 433 | ||
435 | libgnunet_plugin_transport_bluetooth_la_SOURCES = \ | 434 | libgnunet_plugin_transport_bluetooth_la_SOURCES = \ |
436 | plugin_transport_wlan.c plugin_transport_wlan.h | 435 | plugin_transport_wlan.c plugin_transport_wlan.h |
@@ -443,7 +442,7 @@ libgnunet_plugin_transport_bluetooth_la_LIBADD = \ | |||
443 | libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \ | 442 | libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \ |
444 | $(GN_PLUGIN_LDFLAGS) | 443 | $(GN_PLUGIN_LDFLAGS) |
445 | libgnunet_plugin_transport_bluetooth_la_CFLAGS = \ | 444 | libgnunet_plugin_transport_bluetooth_la_CFLAGS = \ |
446 | $(CFLAGS) -DBUILD_BLUETOOTH | 445 | $(AM_CFLAGS) -DBUILD_BLUETOOTH |
447 | 446 | ||
448 | libgnunet_plugin_transport_udp_la_SOURCES = \ | 447 | libgnunet_plugin_transport_udp_la_SOURCES = \ |
449 | plugin_transport_udp.c plugin_transport_udp.h \ | 448 | plugin_transport_udp.c plugin_transport_udp.h \ |
@@ -482,24 +481,22 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ | |||
482 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ | 481 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ |
483 | $(GN_PLUGIN_LDFLAGS) | 482 | $(GN_PLUGIN_LDFLAGS) |
484 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ | 483 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ |
485 | $(CFLAGS) | 484 | $(CPP_GNURL) $(AM_CFLAGS) |
486 | libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ | ||
487 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
488 | 485 | ||
489 | 486 | ||
490 | libgnunet_plugin_transport_http_server_la_SOURCES = \ | 487 | libgnunet_plugin_transport_http_server_la_SOURCES = \ |
491 | plugin_transport_http_server.c plugin_transport_http_common.c | 488 | plugin_transport_http_server.c plugin_transport_http_common.c |
492 | libgnunet_plugin_transport_http_server_la_LIBADD = \ | 489 | libgnunet_plugin_transport_http_server_la_LIBADD = \ |
490 | $(MHD_LIBS) \ | ||
493 | $(top_builddir)/src/hello/libgnunethello.la \ | 491 | $(top_builddir)/src/hello/libgnunethello.la \ |
494 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 492 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
495 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 493 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
496 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 494 | $(top_builddir)/src/nat/libgnunetnatnew.la \ |
497 | $(top_builddir)/src/util/libgnunetutil.la | 495 | $(top_builddir)/src/util/libgnunetutil.la |
498 | libgnunet_plugin_transport_http_server_la_LDFLAGS = \ | 496 | libgnunet_plugin_transport_http_server_la_LDFLAGS = \ |
499 | $(GN_LIBMHD) \ | ||
500 | $(GN_PLUGIN_LDFLAGS) | 497 | $(GN_PLUGIN_LDFLAGS) |
501 | libgnunet_plugin_transport_http_server_la_CFLAGS = \ | 498 | libgnunet_plugin_transport_http_server_la_CFLAGS = \ |
502 | $(CFLAGS) | 499 | $(MHD_CFLAGS) $(AM_CFLAGS) |
503 | 500 | ||
504 | libgnunet_plugin_transport_https_client_la_SOURCES = \ | 501 | libgnunet_plugin_transport_https_client_la_SOURCES = \ |
505 | plugin_transport_http_client.c plugin_transport_http_common.c | 502 | plugin_transport_http_client.c plugin_transport_http_common.c |
@@ -512,24 +509,22 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ | |||
512 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ | 509 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ |
513 | $(GN_PLUGIN_LDFLAGS) | 510 | $(GN_PLUGIN_LDFLAGS) |
514 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ | 511 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ |
515 | $(CFLAGS) -DBUILD_HTTPS | 512 | $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS |
516 | libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ | ||
517 | $(CPP_GNURL) $(AM_CPPFLAGS) | ||
518 | 513 | ||
519 | 514 | ||
520 | libgnunet_plugin_transport_https_server_la_SOURCES = \ | 515 | libgnunet_plugin_transport_https_server_la_SOURCES = \ |
521 | plugin_transport_http_server.c plugin_transport_http_common.c | 516 | plugin_transport_http_server.c plugin_transport_http_common.c |
522 | libgnunet_plugin_transport_https_server_la_LIBADD = \ | 517 | libgnunet_plugin_transport_https_server_la_LIBADD = \ |
518 | $(MHD_LIBS) \ | ||
523 | $(top_builddir)/src/hello/libgnunethello.la \ | 519 | $(top_builddir)/src/hello/libgnunethello.la \ |
524 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 520 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
525 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 521 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
526 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 522 | $(top_builddir)/src/nat/libgnunetnatnew.la \ |
527 | $(top_builddir)/src/util/libgnunetutil.la | 523 | $(top_builddir)/src/util/libgnunetutil.la |
528 | libgnunet_plugin_transport_https_server_la_LDFLAGS = \ | 524 | libgnunet_plugin_transport_https_server_la_LDFLAGS = \ |
529 | $(GN_LIBMHD) \ | ||
530 | $(GN_PLUGIN_LDFLAGS) | 525 | $(GN_PLUGIN_LDFLAGS) |
531 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ | 526 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ |
532 | $(CFLAGS) -DBUILD_HTTPS | 527 | $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS |
533 | 528 | ||
534 | 529 | ||
535 | if HAVE_TESTING | 530 | if HAVE_TESTING |