[taler-merchant] 01/03: fix twister check

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

commit 23ff0cc9dd6ebe02d3172b50c2f942d1abb9c0cb
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Apr 10 16:53:27 2020 +0200

    fix twister check
---
 configure.ac | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 742da9d..bbd95f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ AC_CHECK_HEADERS([taler/taler_fakebank_lib.h],
 AM_CONDITIONAL(HAVE_TALERFAKEBANK, test x$libtalerfakebank = x1)
 
 
-# check for libtalertwistertesting
+# check for libtalertwister
 twistertesting=0
 AC_MSG_CHECKING([for talerwtistertesting])
 AC_ARG_WITH([twister],
@@ -218,14 +218,16 @@ AS_CASE([$with_twister],
         [no], [AC_MSG_WARN([no twister-testing will be compiled])],
         [LDFLAGS="-L$with_twister/lib $LDFLAGS"
          CPPFLAGS="-I$with_twister/include $CPPFLAGS"])
+AC_CHECK_LIB(talertwistertesting,TALER_TWISTER_run_twister,
+  [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1],,
+                   [#ifdef HAVE_GNUNET_PLATFORM_H
+                      #include <gnunet/platform.h>
+                    #endif
+                    ])])
 
-AC_CHECK_HEADERS([taler/taler_twister_testing_lib.h],
- [AC_CHECK_LIB([talertwistertesting], [TALER_TESTING_run_twister], 
twistertesting=1,, [-ltalerexchange -ltalerbank])],
-   [], [#ifdef HAVE_GNUNET_PLATFORM_H
-        #include <gnunet/platform.h>
-       #endif])
 AM_CONDITIONAL(HAVE_TWISTER, test x$twistertesting = x1)
 
+
 # gcov compilation
 AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
 AC_ARG_ENABLE([coverage],

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