diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-09-06 12:34:39 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-09-06 12:34:39 +0200 |
commit | afea0eea1ecfa41150fdf9ee052acac75eee6534 (patch) | |
tree | 1bb24bac4340262b15640fadbdb7beb8a32f695c /src/gns | |
parent | 1d4e7a0eec5ee96d878cdd0e4e3c62c0676bf2d0 (diff) | |
download | gnunet-afea0eea1ecfa41150fdf9ee052acac75eee6534.tar.gz gnunet-afea0eea1ecfa41150fdf9ee052acac75eee6534.zip |
BUILD: Remove gnurl. Improve curl-gnutls detection
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/Makefile.am | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index d49e0c5c8..1fe6ce438 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -42,19 +42,8 @@ dist_pkgcfg_DATA = \ | |||
42 | lib_LTLIBRARIES = \ | 42 | lib_LTLIBRARIES = \ |
43 | libgnunetgns.la | 43 | libgnunetgns.la |
44 | 44 | ||
45 | |||
46 | if HAVE_GNUTLS | 45 | if HAVE_GNUTLS |
47 | if HAVE_LIBGNURL | 46 | DO_PROXY=gnunet-gns-proxy |
48 | DO_PROXY=gnunet-gns-proxy | ||
49 | LIB_GNURL=@LIBGNURL@ | ||
50 | CPP_GNURL=@LIBGNURL_CPPFLAGS@ | ||
51 | else | ||
52 | if HAVE_LIBCURL | ||
53 | DO_PROXY=gnunet-gns-proxy | ||
54 | LIB_GNURL=@LIBCURL@ | ||
55 | CPP_GNURL=@LIBCURL_CPPFLAGS@ | ||
56 | endif | ||
57 | endif | ||
58 | endif | 47 | endif |
59 | 48 | ||
60 | libexec_PROGRAMS = \ | 49 | libexec_PROGRAMS = \ |
@@ -177,7 +166,7 @@ endif | |||
177 | 166 | ||
178 | gnunet_gns_proxy_SOURCES = \ | 167 | gnunet_gns_proxy_SOURCES = \ |
179 | gnunet-gns-proxy.c | 168 | gnunet-gns-proxy.c |
180 | gnunet_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \ | 169 | gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \ |
181 | libgnunetgns.la \ | 170 | libgnunetgns.la \ |
182 | $(top_builddir)/src/identity/libgnunetidentity.la \ | 171 | $(top_builddir)/src/identity/libgnunetidentity.la \ |
183 | $(top_builddir)/src/util/libgnunetutil.la \ | 172 | $(top_builddir)/src/util/libgnunetutil.la \ |
@@ -185,14 +174,14 @@ gnunet_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \ | |||
185 | if HAVE_GNUTLS_DANE | 174 | if HAVE_GNUTLS_DANE |
186 | gnunet_gns_proxy_LDADD += -lgnutls-dane | 175 | gnunet_gns_proxy_LDADD += -lgnutls-dane |
187 | endif | 176 | endif |
188 | gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) | 177 | gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
189 | 178 | ||
190 | test_gns_proxy_SOURCES = \ | 179 | test_gns_proxy_SOURCES = \ |
191 | test_gns_proxy.c | 180 | test_gns_proxy.c |
192 | test_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \ | 181 | test_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \ |
193 | $(top_builddir)/src/util/libgnunetutil.la \ | 182 | $(top_builddir)/src/util/libgnunetutil.la \ |
194 | $(GN_LIBINTL) | 183 | $(GN_LIBINTL) |
195 | test_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS) | 184 | test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
196 | 185 | ||
197 | #gnunet_gns_import_SOURCES = \ | 186 | #gnunet_gns_import_SOURCES = \ |
198 | # gnunet-gns-import.c | 187 | # gnunet-gns-import.c |
@@ -247,11 +236,9 @@ libgnunet_plugin_block_gns_la_LDFLAGS = \ | |||
247 | $(GN_PLUGIN_LDFLAGS) | 236 | $(GN_PLUGIN_LDFLAGS) |
248 | 237 | ||
249 | if HAVE_GNUTLS | 238 | if HAVE_GNUTLS |
250 | if HAVE_LIBGNURL | ||
251 | check_PROGRAMS = \ | 239 | check_PROGRAMS = \ |
252 | test_gns_proxy | 240 | test_gns_proxy |
253 | endif | 241 | endif |
254 | endif | ||
255 | 242 | ||
256 | check_SCRIPTS = \ | 243 | check_SCRIPTS = \ |
257 | test_gns_lookup.sh \ | 244 | test_gns_lookup.sh \ |
@@ -273,11 +260,9 @@ check_SCRIPTS = \ | |||
273 | test_gns_redirect_lookup.sh | 260 | test_gns_redirect_lookup.sh |
274 | 261 | ||
275 | if HAVE_GNUTLS | 262 | if HAVE_GNUTLS |
276 | if HAVE_LIBGNURL | ||
277 | check_SCRIPTS += \ | 263 | check_SCRIPTS += \ |
278 | test_proxy.sh | 264 | test_proxy.sh |
279 | endif | 265 | endif |
280 | endif | ||
281 | check_SCRIPTS += \ | 266 | check_SCRIPTS += \ |
282 | test_plugin_rest_gns.sh | 267 | test_plugin_rest_gns.sh |
283 | 268 | ||