[GNUnet-SVN] [taler-merchant] 04/22: check if twister is installed.

[gnunet]

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

marcello pushed a commit to branch master
in repository merchant.

commit c1b34d21be91cf91a17f04c7f8e490e9b49e5e66
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Mar 6 11:51:44 2018 +0100

    check if twister is installed.
---
 configure.ac        | 21 +++++++++++++++++++++
 src/lib/Makefile.am |  6 +++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b13a58a..3385461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,6 +218,27 @@ then
   fi
 fi
 
+# check for libtalertwistertesting
+twistertesting=0
+AC_MSG_CHECKING([for talerwtistertesting])
+AC_ARG_WITH([twister],
+            [AS_HELP_STRING([--with-twister=PFX], [base of 
libtalertwistertesting])],
+            [AC_MSG_RESULT([given as $with_twister])],
+            [AC_MSG_RESULT([not given])
+             with_twister=yes])
+AS_CASE([$with_twister],
+        [yes], [],
+        [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_TESTING_run_twister,
+  [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1],,
+                   [#ifdef HAVE_GNUNET_PLATFORM_H
+                      #include <gnunet/platform.h>
+                    #endif])]
+  ,,[-ltalerexchange -ltalerbank])
+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],
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3fc6ba6..9235863 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -75,9 +75,13 @@ endif
 
 if HAVE_TALERFAKEBANK
 check_PROGRAMS = \
-  test_merchant_api_twisted \
   test_merchant_api_new \
   test_merchant_api
+
+if HAVE_TWISTER
+  check_PROGRAMS += test_merchant_api_twisted
+endif
+
 endif
 
 TESTS = \

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