[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] branch master updated (081280a8 -> 4b36b6c
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-exchange] branch master updated (081280a8 -> 4b36b6c9) |
Date: |
Sun, 12 May 2019 21:48:19 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository exchange.
from 081280a8 Create async scopes.
new 335f82d0 replace if with AS_IF (#5709, wip)
new 5740f5b6 replace if with AS_IF (#5709, wip)
new bc29ca40 replace if with AS_IF (#5709, wip)
new 652659a8 replace if with AS_IF (#5709, wip)
new 4b36b6c9 replace if with AS_IF (fixes #5709 for exchange)
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
configure.ac | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3c1d9dd3..263e2655 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,11 +31,11 @@ AC_CONFIG_MACRO_DIR([m4])
LT_INIT
DX_INIT_DOXYGEN([taler-exchange],,,
-DX_PS_FEATURE(OFF),
-DX_PDF_FEATURE(OFF),
-DX_RTF_FEATURE(OFF),
-DX_CHI_FEATURE(OFF),
-DX_XML_FEATURE(OFF))
+ DX_PS_FEATURE(OFF),
+ DX_PDF_FEATURE(OFF),
+ DX_RTF_FEATURE(OFF),
+ DX_CHI_FEATURE(OFF),
+ DX_XML_FEATURE(OFF))
AC_MSG_CHECKING([whether to compile documentation ONLY])
AC_ARG_ENABLE([only-doc],
@@ -45,8 +45,9 @@ AC_ARG_ENABLE([only-doc],
AC_MSG_RESULT($doc_only)
AM_CONDITIONAL([DOC_ONLY], [test "x$doc_only" = "xyes"])
-if test "$doc_only" != yes
-then
+
+# Not indented, as most of the file falls under this one...
+AS_IF([test "x$doc_only" != xyes],[
# Checks for programs.
@@ -122,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.
@@ -190,15 +190,15 @@ LIBS_SAVE=$LIBS
LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
LIBCURL_CHECK_CONFIG(,7.34.0,[curl=1],[curl=0])
-if test "x$curl" = x1
-then
+AS_IF([test "x$curl" = x1],[
AC_CHECK_HEADER([curl/curl.h],
AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=1],[curl=0],[[#include
<curl/curl.h>]]),
[curl=0])
# need libcurl-gnutls.so, everything else is not acceptable
AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=0])
# cURL must support CURLINFO_TLS_SESSION, version >= 7.34
-fi
+])
+
# libcurl and libgnurl should be mutually exclusive
AS_IF([test "$gnurl" = 1],
@@ -323,11 +323,12 @@ AS_IF([test $jansson = 0],
# test for postgres
AX_LIB_POSTGRESQL([9.3])
-if test "$found_postgresql" = "yes"; then
- postgres=true
-fi
+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.
@@ -371,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"
@@ -432,21 +433,18 @@ AC_DEFINE_UNQUOTED([HAVE_DEVELOPER],[$enable_dev],[1 if
developer logic is enabl
# -D_FORTIFY_SOURCE=2 -fstack-protector-all
AC_ARG_ENABLE(gcc-hardening,
AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks),
-[if test x$enableval = xyes; then
+[AS_IF([test x$enableval = xyes],[
CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-fstack-protector-all"
CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector"
CFLAGS="$CFLAGS --param ssp-buffer-size=1"
- LDFLAGS="$LDFLAGS -pie"
-fi])
+ LDFLAGS="$LDFLAGS -pie"])])
# Linker hardening options
# Currently these options are ELF specific - you can't use this with MacOSX
AC_ARG_ENABLE(linker-hardening,
AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups),
-[if test x$enableval = xyes; then
- LDFLAGS="$LDFLAGS -z relro -z now"
-fi])
+ [AS_IF([test x$enableval = xyes],[LDFLAGS="$LDFLAGS -z relro -z now"])])
# logging
@@ -514,7 +512,8 @@ test "x$enable_doc" = "xno" || enable_doc=yes
AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
-else
+],[ # This is the big test "$doc_only" on top of the file!
+
# logic if doc_only is set, make sure conditionals are still defined
AM_CONDITIONAL([HAVE_EXPENSIVE_TESTS], [false])
@@ -529,7 +528,7 @@ AM_CONDITIONAL([ENABLE_DOC], [true])
AM_CONDITIONAL([HAVE_TWISTER], [false])
# end of 'doc_only'
-fi
+])
AC_CONFIG_FILES([Makefile
doc/Makefile
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-exchange] branch master updated (081280a8 -> 4b36b6c9),
gnunet <=
- [GNUnet-SVN] [taler-exchange] 01/05: replace if with AS_IF (#5709, wip), gnunet, 2019/05/12
- [GNUnet-SVN] [taler-exchange] 03/05: replace if with AS_IF (#5709, wip), gnunet, 2019/05/12
- [GNUnet-SVN] [taler-exchange] 04/05: replace if with AS_IF (#5709, wip), gnunet, 2019/05/12
- [GNUnet-SVN] [taler-exchange] 02/05: replace if with AS_IF (#5709, wip), gnunet, 2019/05/12
- [GNUnet-SVN] [taler-exchange] 05/05: replace if with AS_IF (fixes #5709 for exchange), gnunet, 2019/05/12