diff options
author | David Barksdale <amatus@amat.us> | 2019-08-27 14:29:17 -0500 |
---|---|---|
committer | David Barksdale <amatus@amat.us> | 2019-08-27 14:29:17 -0500 |
commit | 53fd26b7e0deef386aeb207bfc1e3f7c00a1f775 (patch) | |
tree | db4ed21ae7fb6677b7f7092f529175a76e3d4f6b /src/gns/Makefile.am | |
parent | ba2cae9617e32bf789001415cd787f50af8b3ce9 (diff) | |
download | gnunet-53fd26b7e0deef386aeb207bfc1e3f7c00a1f775.tar.gz gnunet-53fd26b7e0deef386aeb207bfc1e3f7c00a1f775.zip |
Use pkg-config to check for MHD
Diffstat (limited to 'src/gns/Makefile.am')
-rw-r--r-- | src/gns/Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
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 |