merchant

commit 0767f8fbf946006031b5e680e5b190af05e4b373
parent 211a3cb0db1ac6c97835100b4d128d338b19ba0a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 19 May 2020 01:21:00 +0200

Merge branch 'master' into protocolV1

Diffstat:
M
configure.ac
 | 
10
+++-------

1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -142,7 +142,7 @@ AS_IF([test "x$gnurl" = x1],[
 	AM_CONDITIONAL(HAVE_LIBGNURL, false)
 ])
 
-# libcurl-gnutls
+# libcurl
 LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
 AS_IF([test "x$curl" = xtrue],
       [LDFLAGS="-L$with_libcurl/lib $LDFLAGS"
@@ -152,11 +152,7 @@ AS_IF([test "x$curl" = xtrue],
                          [curl=true],
                          [curl=false],
                          [[#include <curl/curl.h>]])],
-                        [curl=false])
-       # need libcurl-gnutls.so, everything else is not acceptable
-       AC_CHECK_LIB([curl-gnutls],
-                    [curl_easy_getinfo],,
-                    [curl=false])])
+                        [curl=false])])
        # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
 
 # Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
@@ -171,7 +167,7 @@ AC_CHECK_HEADERS([curl/curl.h],,
 AS_IF([test "x$gnurl" = "x0"],
       [AS_IF([test "x$curl" = "x0"],
               [AC_MSG_NOTICE([NOTICE: libgnurl not found. taler-bank support will not be compiled.])],
-              [AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.])])])
+              [AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl instead.])])])
 
 AS_IF([test x$curl = xfalse],
        [AM_CONDITIONAL(HAVE_LIBCURL, false)