From 90b8b6e8b14139af59504418285cc1c72a5fdae2 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 16 Aug 2018 12:54:58 +0200 Subject: [PATCH 1/4] use AS_IF instead of shell if Otherwise autoconf macros won't be expanded properly when used inside the 'if' body for the first time. --- configure.ac | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 84f2d6b03..50b79d1a9 100644 --- a/configure.ac +++ b/configure.ac @@ -148,18 +148,17 @@ AS_IF([test $libgnunetjson != 1], # libcurl-gnutls LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false]) -if test "x$curl" = xtrue -then +AS_IF([test "x$curl" = xtrue], [ LDFLAGS="-L$with_libcurl/lib $LDFLAGS" CPPFLAGS="-I$with_libcurl/include $CPPFLAGS" AC_CHECK_HEADERS([curl/curl.h], - AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include ]]), + [AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include ]])], [curl=false]) # need libcurl-gnutls.so, everything else is not acceptable AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false]) # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 +]) -fi if test x$curl = xfalse then AM_CONDITIONAL(HAVE_LIBCURL, false) From 911b158bb841695ffdcfdfc1327a5eff03c53ecd Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 16 Aug 2018 13:03:30 +0200 Subject: [PATCH 2/4] fix some wrong -l flags --- src/bank-lib/Makefile.am | 4 ++-- src/json/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index 9f2740b24..fdd100ff1 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -98,7 +98,7 @@ test_bank_api_with_fakebank_twisted_SOURCES = \ test_bank_api_with_fakebank_twisted.c test_bank_api_with_fakebank_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ - -ltalertesting \ + $(top_builddir)/src/exchange-lib/libtalertesting.la \ -ltalertwistertesting \ -ltalerbanktesting \ -ltalerfakebank \ @@ -116,7 +116,7 @@ test_bank_api_twisted_SOURCES = \ test_bank_api_twisted.c test_bank_api_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ - -ltalertesting \ + $(top_builddir)/src/exchange-lib/libtalertesting.la \ -ltalertwistertesting \ -ltalerbanktesting \ -ltalerfakebank \ diff --git a/src/json/Makefile.am b/src/json/Makefile.am index 4b40e94b4..22173d0a0 100644 --- a/src/json/Makefile.am +++ b/src/json/Makefile.am @@ -33,7 +33,7 @@ check_PROGRAMS= \ test_json_SOURCES = \ test_json.c test_json_LDADD = \ - -ltalerjson \ + $(top_builddir)/src/json/libtalerjson.la \ -lgnunetjson \ $(top_builddir)/src/util/libtalerutil.la \ -lgnunetutil \ From c30bb0008d4aeabe88a29fef3059333b2fd8a6b0 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 16 Aug 2018 13:07:48 +0200 Subject: [PATCH 3/4] fix more wrong -l flags --- src/bank-lib/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index fdd100ff1..a3f61b576 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -100,9 +100,9 @@ test_bank_api_with_fakebank_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/exchange-lib/libtalertesting.la \ -ltalertwistertesting \ - -ltalerbanktesting \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/bank-lib/libtalertesting.la \ -ltalerfakebank \ - -ltalerbank \ -ltalerexchange \ -ltalerjson \ -ltalerutil \ @@ -117,10 +117,10 @@ test_bank_api_twisted_SOURCES = \ test_bank_api_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/exchange-lib/libtalertesting.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/bank-lib/libtalertesting.la \ -ltalertwistertesting \ - -ltalerbanktesting \ -ltalerfakebank \ - -ltalerbank \ -ltalerexchange \ -ltalerjson \ -ltalerutil \ From eefc2e3ff48792380890053523754df5733cf649 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 16 Aug 2018 13:14:47 +0200 Subject: [PATCH 4/4] fix all (?) wrong -l flags --- src/bank-lib/Makefile.am | 18 +++++++++--------- src/exchange-lib/Makefile.am | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index a3f61b576..eae120cb8 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -99,13 +99,13 @@ test_bank_api_with_fakebank_twisted_SOURCES = \ test_bank_api_with_fakebank_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ $(top_builddir)/src/exchange-lib/libtalertesting.la \ - -ltalertwistertesting \ $(top_builddir)/src/bank-lib/libtalerbank.la \ $(top_builddir)/src/bank-lib/libtalertesting.la \ - -ltalerfakebank \ - -ltalerexchange \ - -ltalerjson \ - -ltalerutil \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/exchange-lib/libtalerexchange.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -ltalertwistertesting \ -lgnunetjson \ -lgnunetcurl \ -lgnunetutil \ @@ -119,11 +119,11 @@ test_bank_api_twisted_LDADD = \ $(top_builddir)/src/exchange-lib/libtalertesting.la \ $(top_builddir)/src/bank-lib/libtalerbank.la \ $(top_builddir)/src/bank-lib/libtalertesting.la \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/exchange-lib/libtalerexchange.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ -ltalertwistertesting \ - -ltalerfakebank \ - -ltalerexchange \ - -ltalerjson \ - -ltalerutil \ -lgnunetjson \ -lgnunetcurl \ -lgnunetutil \ diff --git a/src/exchange-lib/Makefile.am b/src/exchange-lib/Makefile.am index c04532ba9..9dbd2256c 100644 --- a/src/exchange-lib/Makefile.am +++ b/src/exchange-lib/Makefile.am @@ -107,13 +107,13 @@ test_exchange_api_twisted_SOURCES = \ test_exchange_api_twisted.c test_exchange_api_twisted_LDADD = \ $(LIBGCRYPT_LIBS) \ - -ltalertesting \ + $(top_builddir)/src/exchange-lib/libtalertesting.la \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/exchange-lib/libtalerexchange.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ -ltalertwistertesting \ - -ltalerfakebank \ - -ltalerbank \ - -ltalerexchange \ - -ltalerjson \ - -ltalerutil \ -lgnunetjson \ -lgnunetcurl \ -lgnunetutil \