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.
This commit is contained in:
Florian Dold 2018-08-16 12:54:58 +02:00
parent a1f289512e
commit 90b8b6e8b1
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B

View File

@ -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)