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

---
 src/Makefile.am | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index d3fde4c1d..8ad3e88e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,13 +3,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if HAVE_POSTGRESQL
   PQ_DIR = pq
 endif
-if HAVE_LIBCURL
-  BANK_LIB = bank-lib
-else
-if HAVE_LIBGNURL
-  BANK_LIB = bank-lib
-endif
-endif
 
 pkgcfgdir = $(prefix)/share/taler/config.d/
 pkgcfg_DATA = \
@@ -18,11 +11,18 @@ pkgcfg_DATA = \
 EXTRA_DIST = \
   taler.conf
 
-SUBDIRS = include util json curl $(PQ_DIR) mhd $(BANK_LIB) exchangedb exchange exchange-tools auditordb auditor
-if HAVE_LIBCURL
- SUBDIRS += lib benchmark
-else
-if HAVE_LIBGNURL
- SUBDIRS += lib benchmark
-endif
-endif
+SUBDIRS = \
+  include \
+  util \
+  json \
+  curl \
+  $(PQ_DIR) \
+  mhd \
+  bank-lib \
+  exchangedb \
+  exchange \
+  exchange-tools \
+  auditordb \
+  auditor \
+  lib \
+  benchmark
-- 
cgit v1.2.3