X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=m4%2Flibgnurl.m4;h=da72e5e879a81b71d22bbf1a46d2f4f29af07aa7;hb=c1d325e4700772b36fdaf897295c05e9d3f9211c;hp=5f5410738629d561d122f71dc1165f3ae4b69ddd;hpb=a00592f7d613c3af1e295abfde86115633972c86;p=oweals%2Fgnunet.git

diff --git a/m4/libgnurl.m4 b/m4/libgnurl.m4
index 5f5410738..da72e5e87 100644
--- a/m4/libgnurl.m4
+++ b/m4/libgnurl.m4
@@ -150,7 +150,7 @@ AC_DEFUN([LIBGNURL_CHECK_CONFIG],
 /* Try and use a few common options to force a failure if we are
    missing symbols or can't link. */
 int x;
-gnurl_easy_setopt(NULL,CURLOPT_URL,NULL);
+curl_easy_setopt(NULL,CURLOPT_URL,NULL);
 x=CURL_ERROR_SIZE;
 x=CURLOPT_WRITEFUNCTION;
 x=CURLOPT_FILE;
@@ -159,6 +159,22 @@ x=CURLOPT_STDERR;
 x=CURLOPT_VERBOSE;
 ])],libgnurl_cv_lib_gnurl_usable=yes,libgnurl_cv_lib_gnurl_usable=no)
 
+# BEGIN Changes from original libcurl.m4:
+# Give it a 2nd shot using 'gnurl/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;
+curl_easy_setopt(NULL,CURLOPT_URL,NULL);
+x=CURL_ERROR_SIZE;
+x=CURLOPT_WRITEFUNCTION;
+x=CURLOPT_FILE;
+x=CURLOPT_ERRORBUFFER;
+x=CURLOPT_STDERR;
+x=CURLOPT_VERBOSE;
+])],libgnurl_cv_lib_gnurl_usable=yes)
+# END Changes from original libcurl.m4:
+
            CPPFLAGS=$_libgnurl_save_cppflags
            LIBS=$_libgnurl_save_libs
            unset _libgnurl_save_cppflags