diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-04-10 16:53:27 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-04-10 16:53:27 +0200 |
| commit | 23ff0cc9dd6ebe02d3172b50c2f942d1abb9c0cb (patch) | |
| tree | ce181e79bb1f208cc3c451d2abc83bc53451db03 | |
| parent | 00658a93f1d26ccb7ba5f10f31055531564a6523 (diff) | |
| download | merchant-23ff0cc9dd6ebe02d3172b50c2f942d1abb9c0cb.tar.gz merchant-23ff0cc9dd6ebe02d3172b50c2f942d1abb9c0cb.tar.bz2 merchant-23ff0cc9dd6ebe02d3172b50c2f942d1abb9c0cb.zip | |
fix twister check
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 742da9d5..bbd95f3c 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], |