From e59e9220d2ebc061013d9eb73297a7c063e131e0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 10 Apr 2020 16:49:30 +0200 Subject: [PATCH] fix check for twister --- configure.ac | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 51a4646d8..ac0a058d4 100644 --- a/configure.ac +++ b/configure.ac @@ -329,10 +329,10 @@ LDFLAGS=$LDFLAGS_SAVE LIBS=$LIBS_SAVE # check for libtalertwistertesting -twistertesting=0 -AC_MSG_CHECKING([for talerwtistertesting]) +talertwister=0 +AC_MSG_CHECKING([for talertwister]) AC_ARG_WITH([twister], - [AS_HELP_STRING([--with-twister=PFX], [base of libtalertwistertesting])], + [AS_HELP_STRING([--with-twister=PFX], [base of libtalertwister])], [AC_MSG_RESULT([given as $with_twister])], [AC_MSG_RESULT([not given]) with_twister=yes]) @@ -341,14 +341,13 @@ 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_TESTING_run_twister, - [AC_CHECK_HEADER([taler/taler_twister_testing_lib.h],[twistertesting=1],, - [#ifdef HAVE_GNUNET_PLATFORM_H - #include - #endif - ])]) -AM_CONDITIONAL(HAVE_TWISTER, test x$twistertesting = x1) +AC_CHECK_HEADERS([taler/taler_twister_service.h], + [AC_CHECK_LIB([talertwister], [TALER_TWISTER_connect], talertwister=1)], + [], [#ifdef HAVE_GNUNET_PLATFORM_H + #include + #endif]) +AM_CONDITIONAL(HAVE_TWISTER, test x$talertwister = x1) # should developer logic be compiled (not-for-production code)? AC_MSG_CHECKING(whether to compile developer logic)