gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-exchange] branch master updated: use AS_IF instead o


From: gnunet
Subject: [GNUnet-SVN] [taler-exchange] branch master updated: use AS_IF instead of shell if
Date: Thu, 16 Aug 2018 12:57:07 +0200

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 90b8b6e8 use AS_IF instead of shell if
90b8b6e8 is described below

commit 90b8b6e8b14139af59504418285cc1c72a5fdae2
Author: Florian Dold <address@hidden>
AuthorDate: Thu Aug 16 12:54:58 2018 +0200

    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 84f2d6b0..50b79d1a 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 
<curl/curl.h>]]),
+   [AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include 
<curl/curl.h>]])],
    [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)

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]