-remove libgnurl checkv0.9.4

1 files changed, 4 insertions, 30 deletions

diff --git a/configure.ac b/configure.ac
index aed3af0..bdab253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,16 +165,6 @@ PKG_CHECK_MODULES([JANSSON], [jansson >= 2.3],
 *** You need libjansson to build this program.
 ***]])])
 
-# check for libgnurl
-# libgnurl
-LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
-AS_IF([test "x$gnurl" = x1],[
-	AM_CONDITIONAL(HAVE_LIBGNURL, true)
-	AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
-],[
-	AM_CONDITIONAL(HAVE_LIBGNURL, false)
-])
-
 # libcurl-gnutls
 LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
 AS_IF([test "x$curl" = xtrue],
@@ -192,30 +182,16 @@ AS_IF([test "x$curl" = xtrue],
                     [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
-# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
-# *either* header set).
+# Check for curl/curl.h
 AC_CHECK_HEADERS([curl/curl.h],,
-  curl=false
-  AC_CHECK_HEADERS([gnurl/curl.h],,
-  gnurl=false))
-
-# libgnurl
-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.])])])
+  curl=false)
 
 AS_IF([test x$curl = xfalse],
-       [AM_CONDITIONAL(HAVE_LIBCURL, false)
-        AS_IF([test "x$gnurl" = "x0"],
-              [AC_MSG_WARN([GNU Taler requires libcurl-gnutls  >= 7.34])])],
-       [AM_CONDITIONAL(HAVE_LIBCURL, true)
-	AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])])
+      [AC_MSG_ERROR([GNU Taler requires libcurl-gnutls  >= 7.34])])
 
 # check for libtalertwistertesting
 twistertesting=0
-AC_MSG_CHECKING([for talerwtistertesting])
+AC_MSG_CHECKING([for talertwistertesting])
 AC_ARG_WITH([twister],
             [AS_HELP_STRING([--with-twister=PFX], [base of libtalertwistertesting])],
             [AC_MSG_RESULT([given as $with_twister])],
@@ -306,8 +282,6 @@ AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
 # logic if doc_only is set, make sure conditionals are still defined
 AM_CONDITIONAL([HAVE_GNUNETPQ], [false])
 AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
-AM_CONDITIONAL([HAVE_LIBCURL], [false])
-AM_CONDITIONAL([HAVE_LIBGNURL], [false])
 AM_CONDITIONAL([USE_COVERAGE], [false])
 AM_CONDITIONAL([ENABLE_DOC], [true])
 AM_CONDITIONAL([HAVE_TWISTER], [true])