[taler-merchant] branch master updated: removed the GnuTLS check for cURL

[gnunet]

This is an automated email from the git hooks/post-receive script.

jonathan-buchanan pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 9782a22  removed the GnuTLS check for cURL
9782a22 is described below

commit 9782a228c1db595fbd25ee0838109371d1787697
Author: Jonathan Buchanan <address@hidden>
AuthorDate: Mon May 18 16:33:01 2020 -0400

    removed the GnuTLS check for cURL
---
 configure.ac | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index bbd95f3..33871db 100644
--- 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)

-- 
To stop receiving notification emails like this one, please contact
address@hidden.