taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix check for twister

Browse Source
This commit is contained in:
Christian Grothoff 2020-04-10 16:49:30 +02:00
parent dccb300b76
commit e59e9220d2
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -329,10 +329,10 @@ LDFLAGS=$LDFLAGS_SAVE
LIBS=$LIBS_SAVE LIBS=$LIBS_SAVE
# check for libtalertwistertesting # check for libtalertwistertesting
twistertesting=0 talertwister=0
AC_MSG_CHECKING([for talerwtistertesting]) AC_MSG_CHECKING([for talertwister])
AC_ARG_WITH([twister], 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([given as $with_twister])],
[AC_MSG_RESULT([not given]) [AC_MSG_RESULT([not given])
with_twister=yes]) with_twister=yes])
@ -341,14 +341,13 @@ AS_CASE([$with_twister],
[no], [AC_MSG_WARN([no twister-testing will be compiled])], [no], [AC_MSG_WARN([no twister-testing will be compiled])],
[LDFLAGS="-L$with_twister/lib $LDFLAGS" [LDFLAGS="-L$with_twister/lib $LDFLAGS"
CPPFLAGS="-I$with_twister/include $CPPFLAGS"]) 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
])])
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 <gnunet/platform.h>
#endif])
AM_CONDITIONAL(HAVE_TWISTER, test x$talertwister = x1)
# should developer logic be compiled (not-for-production code)? # should developer logic be compiled (not-for-production code)?
AC_MSG_CHECKING(whether to compile developer logic) AC_MSG_CHECKING(whether to compile developer logic)