From 83995cf89e0515b46d65badd09b641c988a5ea9d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 4 Sep 2014 12:49:32 +0000 Subject: address Debian #758937: allow use of curl if it is really the gnutls version and libgnurl is unavailable --- configure.ac | 33 +++++++++++++-- po/POTFILES.in | 100 ++++++++++++++++++++++++---------------------- src/gns/Makefile.am | 12 +++++- src/hostlist/Makefile.am | 14 ++++++- src/pt/Makefile.am | 44 +++++++++++++++----- src/transport/Makefile.am | 37 +++++++++++++++-- 6 files changed, 171 insertions(+), 69 deletions(-) diff --git a/configure.ac b/configure.ac index 24915a14e..687ea1e20 100644 --- a/configure.ac +++ b/configure.ac @@ -461,6 +461,27 @@ else AM_CONDITIONAL(HAVE_LIBGNURL, false) fi +# libcurl-gnutls +LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) +if test "x$curl" = xtrue +then + AC_CHECK_HEADERS([curl/curl.h], + AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include ]]), + [curl=false]) + # need libcurl-gnutls.so, everything else is not acceptable + AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) + # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 + +fi +if test x$curl = xfalse +then + AM_CONDITIONAL(HAVE_LIBCURL, false) + AC_MSG_WARN([GNUnet requires libcurl-gnutls >= 7.34]) +else + AM_CONDITIONAL(HAVE_LIBCURL, true) + AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL]) +fi + # libidn AC_MSG_CHECKING([if Libidn can be used]) @@ -1197,7 +1218,7 @@ AC_ARG_ENABLE([malicious], [malicious=0 enable_malicious=no]) AC_MSG_RESULT($enable_malicious) -AM_CONDITIONAL([ENABLE_MALICIOUS], [$malicious]) +AM_CONDITIONAL([ENABLE_MALICIOUS], [1=$malicious]) AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious], [enable compilation of malicious code]) @@ -1552,10 +1573,16 @@ fi # libgnurl if test "x$gnurl" = "x0" then - AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) - AC_MSG_WARN([libgnurl not found. hostlist daemon will not be compiled, and you probably WANT hostlist daemon]) + if test "x$curl" = "x0" + then + AC_MSG_NOTICE([NOTICE: libgnurl not found. http client support will not be compiled.]) + AC_MSG_WARN([ERROR: libgnurl not found. hostlist daemon will not be compiled, and you probably WANT the hostlist daemon]) + else + AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.]) + fi fi + # bluetooth if test "x$bluetooth" = "x0" then diff --git a/po/POTFILES.in b/po/POTFILES.in index b7d6b2a0d..dd6068e1c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,11 +3,19 @@ src/arm/arm_monitor_api.c src/arm/gnunet-arm.c src/arm/gnunet-service-arm.c src/arm/mockup-service.c +src/ats-tests/ats-testing-experiment.c +src/ats-tests/ats-testing-log.c +src/ats-tests/ats-testing-preferences.c +src/ats-tests/ats-testing-traffic.c +src/ats-tests/ats-testing.c +src/ats-tests/gnunet-ats-sim.c +src/ats-tests/gnunet-solver-eval.c +src/ats-tool/gnunet-ats.c src/ats/ats_api_performance.c src/ats/ats_api_scheduling.c src/ats/gnunet-ats-solver-eval.c -src/ats/gnunet-service-ats_addresses.c src/ats/gnunet-service-ats.c +src/ats/gnunet-service-ats_addresses.c src/ats/gnunet-service-ats_normalization.c src/ats/gnunet-service-ats_performance.c src/ats/gnunet-service-ats_reservations.c @@ -15,14 +23,6 @@ src/ats/gnunet-service-ats_scheduling.c src/ats/plugin_ats_mlp.c src/ats/plugin_ats_proportional.c src/ats/plugin_ats_ril.c -src/ats-tests/ats-testing.c -src/ats-tests/ats-testing-experiment.c -src/ats-tests/ats-testing-log.c -src/ats-tests/ats-testing-preferences.c -src/ats-tests/ats-testing-traffic.c -src/ats-tests/gnunet-ats-sim.c -src/ats-tests/gnunet-solver-eval.c -src/ats-tool/gnunet-ats.c src/block/block.c src/block/plugin_block_template.c src/block/plugin_block_test.c @@ -31,8 +31,8 @@ src/cadet/cadet_common.c src/cadet/cadet_path.c src/cadet/cadet_test_lib.c src/cadet/cadet_tunnel_tree.c -src/cadet/gnunet-cadet.c src/cadet/gnunet-cadet-profiler.c +src/cadet/gnunet-cadet.c src/cadet/gnunet-service-cadet.c src/cadet/gnunet-service-cadet_channel.c src/cadet/gnunet-service-cadet_connection.c @@ -46,12 +46,12 @@ src/consensus/gnunet-consensus-profiler.c src/consensus/gnunet-service-consensus.c src/conversation/conversation_api.c src/conversation/conversation_api_call.c -src/conversation/gnunet-conversation.c src/conversation/gnunet-conversation-test.c -src/conversation/gnunet-helper-audio-playback.c +src/conversation/gnunet-conversation.c src/conversation/gnunet-helper-audio-playback-gst.c -src/conversation/gnunet-helper-audio-record.c +src/conversation/gnunet-helper-audio-playback.c src/conversation/gnunet-helper-audio-record-gst.c +src/conversation/gnunet-helper-audio-record.c src/conversation/gnunet-service-conversation.c src/conversation/microphone.c src/conversation/plugin_gnsrecord_conversation.c @@ -82,7 +82,6 @@ src/dht/dht_api.c src/dht/dht_test_lib.c src/dht/gnunet-dht-get.c src/dht/gnunet-dht-monitor.c -src/dht/gnunet_dht_profiler.c src/dht/gnunet-dht-put.c src/dht/gnunet-service-dht.c src/dht/gnunet-service-dht_clients.c @@ -98,6 +97,8 @@ src/dht/gnunet-service-xdht_hello.c src/dht/gnunet-service-xdht_neighbours.c src/dht/gnunet-service-xdht_nse.c src/dht/gnunet-service-xdht_routing.c +src/dht/gnunet_dht_profiler.c +src/dht/gnunet_dht_r5n_profiler.c src/dht/plugin_block_dht.c src/dns/dns_api.c src/dns/dnsparser.c @@ -113,8 +114,8 @@ src/dv/gnunet-service-dv.c src/dv/plugin_transport_dv.c src/env/env.c src/exit/gnunet-daemon-exit.c -src/exit/gnunet-helper-exit.c src/exit/gnunet-helper-exit-windows.c +src/exit/gnunet-helper-exit.c src/experimentation/gnunet-daemon-experimentation.c src/experimentation/gnunet-daemon-experimentation_capabilities.c src/experimentation/gnunet-daemon-experimentation_experiments.c @@ -145,8 +146,8 @@ src/fs/gnunet-auto-share.c src/fs/gnunet-daemon-fsprofiler.c src/fs/gnunet-directory.c src/fs/gnunet-download.c -src/fs/gnunet-fs.c src/fs/gnunet-fs-profiler.c +src/fs/gnunet-fs.c src/fs/gnunet-helper-fs-publish.c src/fs/gnunet-publish.c src/fs/gnunet-search.c @@ -165,10 +166,10 @@ src/fs/plugin_block_fs.c src/gns/gns_api.c src/gns/gnunet-bcd.c src/gns/gnunet-dns2gns.c -src/gns/gnunet-gns.c src/gns/gnunet-gns-helper-service-w32.c src/gns/gnunet-gns-import.c src/gns/gnunet-gns-proxy.c +src/gns/gnunet-gns.c src/gns/gnunet-service-gns.c src/gns/gnunet-service-gns_interceptor.c src/gns/gnunet-service-gns_resolver.c @@ -177,15 +178,15 @@ src/gns/nss/nss_gns.c src/gns/nss/nss_gns_query.c src/gns/plugin_block_gns.c src/gns/plugin_gnsrecord_gns.c +src/gns/w32nsp-install.c +src/gns/w32nsp-resolve.c +src/gns/w32nsp-uninstall.c +src/gns/w32nsp.c src/gnsrecord/gnsrecord.c src/gnsrecord/gnsrecord_crypto.c src/gnsrecord/gnsrecord_misc.c src/gnsrecord/gnsrecord_serialization.c src/gnsrecord/plugin_gnsrecord_dns.c -src/gns/w32nsp.c -src/gns/w32nsp-install.c -src/gns/w32nsp-resolve.c -src/gns/w32nsp-uninstall.c src/hello/address.c src/hello/gnunet-hello.c src/hello/hello.c @@ -205,31 +206,31 @@ src/namecache/gnunet-service-namecache.c src/namecache/namecache_api.c src/namecache/plugin_namecache_postgres.c src/namecache/plugin_namecache_sqlite.c -src/namestore/gnunet-namestore.c src/namestore/gnunet-namestore-fcfsd.c +src/namestore/gnunet-namestore.c src/namestore/gnunet-service-namestore.c src/namestore/namestore_api.c src/namestore/namestore_api_monitor.c src/namestore/plugin_namestore_postgres.c src/namestore/plugin_namestore_sqlite.c -src/nat/gnunet-helper-nat-client.c src/nat/gnunet-helper-nat-client-windows.c -src/nat/gnunet-helper-nat-server.c +src/nat/gnunet-helper-nat-client.c src/nat/gnunet-helper-nat-server-windows.c +src/nat/gnunet-helper-nat-server.c src/nat/gnunet-nat-server.c -src/nat/nat_auto.c src/nat/nat.c +src/nat/nat_auto.c src/nat/nat_mini.c src/nat/nat_test.c -src/nse/gnunet-nse.c src/nse/gnunet-nse-profiler.c +src/nse/gnunet-nse.c src/nse/gnunet-service-nse.c src/nse/nse_api.c +src/peerinfo-tool/gnunet-peerinfo.c +src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerinfo/gnunet-service-peerinfo.c src/peerinfo/peerinfo_api.c src/peerinfo/peerinfo_api_notify.c -src/peerinfo-tool/gnunet-peerinfo.c -src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerstore/gnunet-peerstore.c src/peerstore/gnunet-service-peerstore.c src/peerstore/peerstore_api.c @@ -266,17 +267,19 @@ src/secretsharing/gnunet-secretsharing-profiler.c src/secretsharing/gnunet-service-secretsharing.c src/secretsharing/secretsharing_api.c src/secretsharing/secretsharing_common.c -src/sensordashboard/gnunet-sensordashboard.c -src/sensordashboard/gnunet-service-sensordashboard.c +src/sensor/gnunet-sensor-profiler.c src/sensor/gnunet-sensor.c -src/sensor/gnunet-service-sensor_analysis.c src/sensor/gnunet-service-sensor.c -src/sensor/gnunet-service-sensor_reporting_anomaly.c -src/sensor/gnunet-service-sensor_reporting_value.c +src/sensor/gnunet-service-sensor_analysis.c +src/sensor/gnunet-service-sensor_monitoring.c +src/sensor/gnunet-service-sensor_reporting.c src/sensor/gnunet-service-sensor_update.c src/sensor/plugin_sensor_model_gaussian.c src/sensor/sensor_api.c src/sensor/sensor_util_lib.c +src/sensor/sensor_util_lib_crypto.c +src/sensordashboard/gnunet-sensordashboard.c +src/sensordashboard/gnunet-service-sensordashboard.c src/set/gnunet-service-set.c src/set/gnunet-service-set_intersection.c src/set/gnunet-service-set_union.c @@ -297,30 +300,30 @@ src/testbed/gnunet-daemon-latency-logger.c src/testbed/gnunet-daemon-testbed-blacklist.c src/testbed/gnunet-daemon-testbed-underlay.c src/testbed/gnunet-helper-testbed.c -src/testbed/gnunet_mpi_test.c src/testbed/gnunet-service-test-barriers.c -src/testbed/gnunet-service-testbed_barriers.c +src/testbed/gnunet-service-testbed-logger.c src/testbed/gnunet-service-testbed.c +src/testbed/gnunet-service-testbed_barriers.c src/testbed/gnunet-service-testbed_cache.c src/testbed/gnunet-service-testbed_connectionpool.c src/testbed/gnunet-service-testbed_cpustatus.c src/testbed/gnunet-service-testbed_links.c -src/testbed/gnunet-service-testbed-logger.c src/testbed/gnunet-service-testbed_meminfo.c src/testbed/gnunet-service-testbed_oc.c src/testbed/gnunet-service-testbed_peers.c -src/testbed/gnunet_testbed_mpi_spawn.c src/testbed/gnunet-testbed-profiler.c -src/testbed/testbed_api_barriers.c +src/testbed/gnunet_mpi_test.c +src/testbed/gnunet_testbed_mpi_spawn.c src/testbed/testbed_api.c +src/testbed/testbed_api_barriers.c src/testbed/testbed_api_hosts.c src/testbed/testbed_api_operations.c src/testbed/testbed_api_peers.c src/testbed/testbed_api_sd.c src/testbed/testbed_api_services.c src/testbed/testbed_api_statistics.c -src/testbed/testbed_api_testbed.c src/testbed/testbed_api_test.c +src/testbed/testbed_api_testbed.c src/testbed/testbed_api_topology.c src/testbed/testbed_api_underlay.c src/testbed/testbed_logger_api.c @@ -330,36 +333,37 @@ src/testing/testing.c src/topology/friends.c src/topology/gnunet-daemon-topology.c src/transport/gnunet-helper-transport-bluetooth.c -src/transport/gnunet-helper-transport-wlan.c src/transport/gnunet-helper-transport-wlan-dummy.c -src/transport/gnunet-service-transport_blacklist.c +src/transport/gnunet-helper-transport-wlan.c src/transport/gnunet-service-transport.c +src/transport/gnunet-service-transport_blacklist.c src/transport/gnunet-service-transport_clients.c src/transport/gnunet-service-transport_hello.c src/transport/gnunet-service-transport_manipulation.c src/transport/gnunet-service-transport_neighbours.c src/transport/gnunet-service-transport_plugins.c src/transport/gnunet-service-transport_validation.c -src/transport/gnunet-transport.c src/transport/gnunet-transport-certificate-creation.c +src/transport/gnunet-transport-profiler.c src/transport/gnunet-transport-wlan-receiver.c src/transport/gnunet-transport-wlan-sender.c +src/transport/gnunet-transport.c src/transport/plugin_transport_http_client.c src/transport/plugin_transport_http_common.c src/transport/plugin_transport_http_server.c src/transport/plugin_transport_smtp.c src/transport/plugin_transport_tcp.c src/transport/plugin_transport_template.c -src/transport/plugin_transport_udp_broadcasting.c src/transport/plugin_transport_udp.c +src/transport/plugin_transport_udp_broadcasting.c src/transport/plugin_transport_unix.c src/transport/plugin_transport_wlan.c +src/transport/transport-testing.c +src/transport/transport_api.c src/transport/transport_api_address_to_string.c src/transport/transport_api_blacklist.c -src/transport/transport_api.c src/transport/transport_api_monitor_peers.c src/transport/transport_api_monitor_validation.c -src/transport/transport-testing.c src/tun/regex.c src/tun/tun.c src/util/bandwidth.c @@ -374,8 +378,8 @@ src/util/connection.c src/util/container_bloomfilter.c src/util/container_heap.c src/util/container_meta_data.c -src/util/container_multihashmap32.c src/util/container_multihashmap.c +src/util/container_multihashmap32.c src/util/container_multipeermap.c src/util/container_slist.c src/util/crypto_crc.c @@ -390,8 +394,8 @@ src/util/crypto_symmetric.c src/util/disk.c src/util/getopt.c src/util/getopt_helpers.c -src/util/gnunet-config.c src/util/gnunet-config-diff.c +src/util/gnunet-config.c src/util/gnunet-ecc.c src/util/gnunet-helper-w32-console.c src/util/gnunet-resolver.c @@ -422,8 +426,8 @@ src/util/time.c src/util/w32cat.c src/util/win.c src/util/winproc.c -src/vpn/gnunet-helper-vpn.c src/vpn/gnunet-helper-vpn-windows.c +src/vpn/gnunet-helper-vpn.c src/vpn/gnunet-service-vpn.c src/vpn/gnunet-vpn.c src/vpn/vpn_api.c diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index f8d266748..61e52ee98 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -55,6 +55,14 @@ if HAVE_MHD if HAVE_GNUTLS if HAVE_LIBGNURL DO_PROXY=gnunet-gns-proxy +LIB_GNURL=@LIBGNURL@ +CPP_GNURL=@LIBGNURL_CPPFLAGS@ +else +if HAVE_LIBCURL + DO_PROXY=gnunet-gns-proxy +LIB_GNURL=@LIBCURL@ +CPP_GNURL=@LIBCURL_CPPFLAGS@ +endif endif endif endif @@ -141,8 +149,8 @@ gnunet_dns2gns_DEPENDENCIES = \ gnunet_gns_proxy_SOURCES = \ gnunet-gns-proxy.c -gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(LIBGNURL_CPPFLAGS) -gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIBGNURL) -lgnutls \ +gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL) +gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \ $(top_builddir)/src/gns/libgnunetgns.la \ $(top_builddir)/src/identity/libgnunetidentity.la \ $(top_builddir)/src/util/libgnunetutil.la \ diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index d777cd658..5d5a94b5d 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -20,6 +20,15 @@ endif if HAVE_LIBGNURL libexec_PROGRAMS = \ gnunet-daemon-hostlist +LIB_GNURL=@LIBGNURL@ +CPP_GNURL=@LIBGNURL_CPPFLAGS@ +else +if HAVE_LIBCURL +libexec_PROGRAMS = \ + gnunet-daemon-hostlist +LIB_GNURL=@LIBCURL@ +CPP_GNURL=@LIBCURL_CPPFLAGS@ +endif endif gnunet_daemon_hostlist_SOURCES = \ @@ -35,11 +44,12 @@ gnunet_daemon_hostlist_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBMHD) \ - @LIBGNURL@ \ + $(LIB_GNURL) \ $(GN_LIBINTL) gnunet_daemon_hostlist_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) \ + $(AM_CPPFLAGS) if HAVE_LIBGNURL check_PROGRAMS = \ diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 650fabf09..9783ffc07 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am @@ -34,7 +34,29 @@ gnunet_daemon_pt_LDADD = \ if HAVE_TESTING if HAVE_MHD + if HAVE_LIBGNURL +LIB_GNURL=@LIBGNURL@ +CPP_GNURL=@LIBGNURL_CPPFLAGS@ +if LINUX + VPN_TEST = \ + test_gnunet_vpn-4_to_6 \ + test_gnunet_vpn-6_to_4 \ + test_gnunet_vpn-6_over \ + test_gnunet_vpn-4_over \ + test_gns_vpn +endif +if MINGW + VPN_TEST = \ + test_gnunet_vpn-4_to_6 \ + test_gnunet_vpn-6_to_4 \ + test_gnunet_vpn-6_over \ + test_gnunet_vpn-4_over +endif +else +if HAVE_LIBCURL +LIB_GNURL=@LIBCURL@ +CPP_GNURL=@LIBCURL_CPPFLAGS@ if LINUX VPN_TEST = \ test_gnunet_vpn-4_to_6 \ @@ -51,6 +73,8 @@ if MINGW test_gnunet_vpn-4_over endif endif +endif + endif endif @@ -69,48 +93,48 @@ EXTRA_DIST = \ test_gns_vpn_SOURCES = \ test_gns_vpn.c -test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ +test_gns_vpn_LDADD = -lmicrohttpd $(LIB_GNURL) \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_gns_vpn_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) $(AM_CPPFLAGS) test_gnunet_vpn_4_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ +test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_4_over_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(LIB_GNURL) $(AM_CPPFLAGS) test_gnunet_vpn_6_over_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ +test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_6_over_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) $(AM_CPPFLAGS) test_gnunet_vpn_4_to_6_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ +test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_4_to_6_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) $(AM_CPPFLAGS) test_gnunet_vpn_6_to_4_SOURCES = \ test_gnunet_vpn.c -test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ +test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIB_GNURL) \ $(top_builddir)/src/vpn/libgnunetvpn.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_gnunet_vpn_6_to_4_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) $(AM_CPPFLAGS) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index d4a1001c9..dd7bedbae 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -23,6 +23,17 @@ if HAVE_LIBGNURL HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la +LIB_GNURL=@LIBGNURL@ +CPP_GNURL=@LIBGNURL_CPPFLAGS@ +else +if HAVE_LIBCURL + HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client + HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client + HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la + HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la +LIB_GNURL=@LIBCURL@ +CPP_GNURL=@LIBCURL_CPPFLAGS@ +endif endif if HAVE_MHD @@ -42,6 +53,24 @@ if HAVE_LIBGNURL HTTPS_QUOTA_TEST = test_quota_compliance_https \ test_quota_compliance_https_asymmetric HTTPS_SWITCH = test_transport_address_switch_https +else +if HAVE_LIBCURL + HTTP_API_TEST = test_transport_api_http + HTTP_REVERSE_API_TEST = test_transport_api_http_reverse + HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http + HTTP_REL_TEST = test_transport_api_reliability_http \ + test_transport_api_reliability_http_xhr + HTTP_QUOTA_TEST = test_quota_compliance_http \ + test_quota_compliance_http_asymmetric + HTTP_SWITCH = test_transport_address_switch_http + HTTPS_API_TEST = test_transport_api_https + HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https + HTTPS_REL_TEST = test_transport_api_reliability_https \ + test_transport_api_reliability_https_xhr + HTTPS_QUOTA_TEST = test_quota_compliance_https \ + test_quota_compliance_https_asymmetric + HTTPS_SWITCH = test_transport_address_switch_https +endif endif endif @@ -334,7 +363,7 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ - @LIBGNURL@ \ + $(LIB_GNURL) \ $(top_builddir)/src/nat/libgnunetnat.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_http_client_la_LDFLAGS = \ @@ -342,7 +371,7 @@ libgnunet_plugin_transport_http_client_la_LDFLAGS = \ libgnunet_plugin_transport_http_client_la_CFLAGS = \ $(CFLAGS) libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) $(AM_CPPFLAGS) libgnunet_plugin_transport_http_server_la_SOURCES = \ @@ -365,7 +394,7 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ - @LIBGNURL@ \ + $(LIB_GNURL) \ $(top_builddir)/src/nat/libgnunetnat.la \ $(top_builddir)/src/util/libgnunetutil.la libgnunet_plugin_transport_https_client_la_LDFLAGS = \ @@ -373,7 +402,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 = \ - @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) + $(CPP_GNURL) $(AM_CPPFLAGS) libgnunet_plugin_transport_https_server_la_SOURCES = \ -- cgit v1.2.3