From 7fad7cb71603878943ee6193056142097cd8ccd3 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 16 Jan 2020 14:11:54 +0100
Subject: make lib(c|gn)url mandatory, cleaner makefiles

---
 configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 4761083e4..bb771dc2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,17 +191,17 @@ AS_IF([test "$gnurl" = 1],
       [AM_CONDITIONAL(HAVE_LIBGNURL, true)
        AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
        AM_CONDITIONAL(HAVE_LIBCURL, false)
-       AC_DEFINE([HAVE_LIBCURL],[0],[Lacking libcurl])],
+       AC_DEFINE([HAVE_LIBCURL],[0],[Lacking libcurl])
+       [LIBGNURLCURL_LIBS="-lgnurl"]],
       [AS_IF([test "$curl" = 1],
              [AM_CONDITIONAL(HAVE_LIBGNURL, false)
               AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl])
               AM_CONDITIONAL(HAVE_LIBCURL, true)
               AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])],
-             [AC_MSG_WARN([WARNING: No libgnurl/libcurl, taler-bank support will not be compiled])
-              AM_CONDITIONAL(HAVE_LIBGNURL, false)
-              AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl])
-              AM_CONDITIONAL(HAVE_LIBCURL, false)
-              AC_DEFINE([HAVE_LIBCURL],[0],[Lacking libcurl])])])
+              [LIBGNURLCURL_LIBS="-lcurl"]
+             [AC_MSG_ERROR([WARNING: No libgnurl/libcurl, taler-bank support will not be compiled])])])
+
+AC_SUBST([LIBGNURLCURL_LIBS])
 
 # Check for GNUnet's libgnunetcurl.
 libgnunetcurl=0
-- 
cgit v1.2.3