Make gnurl and curl mutually exclusive.

This prevents issues when both curl and gnurl are available, but one of
them is outdated.

To get curl.h, we also now just include gnunet_curl_lib.h instead of
writing the preprocessor conditionals manually.

Fixes #5707

2 files changed, 4 insertions, 10 deletions

diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h
index 6867d3b9d..b6ada8f86 100644
--- a/src/transport/plugin_transport_http.h
+++ b/src/transport/plugin_transport_http.h
@@ -41,11 +41,8 @@
 #include "gnunet_os_lib.h"
 #include "gnunet_nat_lib.h"
 #include "microhttpd.h"
-#if HAVE_CURL_CURL_H
-#include <curl/curl.h>
-#elif HAVE_GNURL_CURL_H
-#include <gnurl/curl.h>
-#endif
+/* Just included for the right curl.h */
+#include "gnunet_curl_lib.h"
 
 
 #define DEBUG_HTTP GNUNET_EXTRA_LOGGING
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 3c8dc21e5..c4d70d4c3 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -49,11 +49,8 @@
 #include "gnunet_protocols.h"
 #include "gnunet_transport_plugin.h"
 #include "plugin_transport_http_common.h"
-#if HAVE_CURL_CURL_H
-#include <curl/curl.h>
-#elif HAVE_GNURL_CURL_H
-#include <gnurl/curl.h>
-#endif
+/* Just included for the right curl.h */
+#include "gnunet_curl_lib.h"
 
 
 #define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__)