From 4b36b6c964a3739d02362616dc61bace3e84b4a3 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 12 May 2019 21:40:45 +0200 Subject: replace if with AS_IF (fixes #5709 for exchange) --- configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 583c1b2f4..263e2655f 100644 --- a/configure.ac +++ b/configure.ac @@ -123,8 +123,7 @@ fd = epoll_create1(EPOLL_CLOEXEC);]])], AC_DEFINE([[HAVE_EPOLL_CREATE1]], [[1]], [Define if you have epoll_create1 function.])])) -if test "$wallet_only" != yes -then +AS_IF([test "x$wallet_only" != xyes],[ # Check for GNUnet's libgnunetutil. @@ -200,6 +199,7 @@ AS_IF([test "x$curl" = x1],[ # cURL must support CURLINFO_TLS_SESSION, version >= 7.34 ]) + # libcurl and libgnurl should be mutually exclusive AS_IF([test "$gnurl" = 1], [AM_CONDITIONAL(HAVE_LIBGNURL, true) @@ -326,7 +326,9 @@ AX_LIB_POSTGRESQL([9.3]) AS_IF([test "x$found_postgresql" = "xyes"],[postgres=true]) -else +# true clause: test wallet-only set to false +],[ +# false clause: for test wallet-only set to true # Check for GNUnet's libgnunetutil_taler_wallet. @@ -370,7 +372,7 @@ LIBS=$LIBS_SAVE # end of wallet/no-wallet specific logic -fi +]) TALER_LIB_LDFLAGS="-export-dynamic -no-undefined" TALER_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined" -- cgit v1.2.3