|
|
@ -1,88 +0,0 @@ |
|
|
|
--- a/m4/libgnurl.m4
|
|
|
|
+++ b/m4/libgnurl.m4
|
|
|
|
@@ -146,7 +146,7 @@ AC_DEFUN([LIBGNURL_CHECK_CONFIG],
|
|
|
|
_libgnurl_save_libs=$LIBS |
|
|
|
LIBS="$LIBGNURL $LIBS" |
|
|
|
|
|
|
|
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[
|
|
|
|
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gnurl/curl.h>],[
|
|
|
|
/* Try and use a few common options to force a failure if we are |
|
|
|
missing symbols or can't link. */ |
|
|
|
int x; |
|
|
|
--- a/src/gns/gnunet-gns-proxy.c
|
|
|
|
+++ b/src/gns/gnunet-gns-proxy.c
|
|
|
|
@@ -29,7 +29,7 @@
|
|
|
|
*/ |
|
|
|
#include "platform.h" |
|
|
|
#include <microhttpd.h> |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
#include <gnutls/gnutls.h> |
|
|
|
#include <gnutls/x509.h> |
|
|
|
#include <gnutls/abstract.h> |
|
|
|
--- a/src/gns/test_gns_proxy.c
|
|
|
|
+++ b/src/gns/test_gns_proxy.c
|
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
* @author Martin Schanzenbach |
|
|
|
*/ |
|
|
|
#include "platform.h" |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
#include <microhttpd.h> |
|
|
|
#include "gnunet_namestore_service.h" |
|
|
|
#include "gnunet_gns_service.h" |
|
|
|
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
|
|
|
|
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
|
|
|
|
@@ -29,7 +29,7 @@
|
|
|
|
#include "gnunet_statistics_service.h" |
|
|
|
#include "gnunet_transport_service.h" |
|
|
|
#include "gnunet-daemon-hostlist.h" |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
--- a/src/pt/test_gns_vpn.c
|
|
|
|
+++ b/src/pt/test_gns_vpn.c
|
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
* @author Martin Schanzenbach |
|
|
|
*/ |
|
|
|
#include "platform.h" |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
#include <microhttpd.h> |
|
|
|
#include "gnunet_identity_service.h" |
|
|
|
#include "gnunet_namestore_service.h" |
|
|
|
--- a/src/pt/test_gnunet_vpn.c
|
|
|
|
+++ b/src/pt/test_gnunet_vpn.c
|
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
* @author Christian Grothoff |
|
|
|
*/ |
|
|
|
#include "platform.h" |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
#include <microhttpd.h> |
|
|
|
#include "gnunet_vpn_service.h" |
|
|
|
#include "gnunet_testing_lib.h" |
|
|
|
--- a/src/transport/plugin_transport_http.h
|
|
|
|
+++ b/src/transport/plugin_transport_http.h
|
|
|
|
@@ -41,7 +41,7 @@
|
|
|
|
#include "gnunet_os_lib.h" |
|
|
|
#include "gnunet_nat_lib.h" |
|
|
|
#include "microhttpd.h" |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
|
|
|
|
|
|
|
|
#define DEBUG_HTTP GNUNET_EXTRA_LOGGING |
|
|
|
--- a/src/transport/plugin_transport_http_client.c
|
|
|
|
+++ b/src/transport/plugin_transport_http_client.c
|
|
|
|
@@ -49,7 +49,7 @@
|
|
|
|
#include "gnunet_protocols.h" |
|
|
|
#include "gnunet_transport_plugin.h" |
|
|
|
#include "plugin_transport_http_common.h" |
|
|
|
-#include <curl/curl.h>
|
|
|
|
+#include <gnurl/curl.h>
|
|
|
|
|
|
|
|
|
|
|
|
#define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__) |