From 302ba9e8f253dc4c1c8dd356c0b86d4864427047 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Mar 2015 11:13:19 +0000 Subject: add --enable-wachs option --- configure.ac | 9 +++++++++ src/Makefile.am | 11 +++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 8374c5c7e..bb4f74366 100644 --- a/configure.ac +++ b/configure.ac @@ -1207,6 +1207,15 @@ AC_ARG_ENABLE([experimental], AC_MSG_RESULT($enable_experimental) AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) +# FTBFS right now... +AC_MSG_CHECKING(whether to compile ATS test code) +AC_ARG_ENABLE([wachs], + [AS_HELP_STRING([--enable-wachs], [enable compiling ATS test code])], + [enable_wachs=${enableval}], + [enable_wachs=no]) +AC_MSG_RESULT($enable_wachs) +AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"]) + # should malicious code be compiled (should only be used for testing)? AC_MSG_CHECKING(whether to compile malicious code) AC_ARG_ENABLE([malicious], diff --git a/src/Makefile.am b/src/Makefile.am index cdfd5f307..94419d327 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,9 +24,13 @@ if HAVE_EXPERIMENTAL $(CONSENSUS) \ $(SECRETSHARING) \ $(SENSOR) \ - $(SENSORDASHBOARD) + $(SENSORDASHBOARD) \ endif +if HAVE_WACHS + WACHS_DIR = \ + ats-tests +endif if BUILD_PULSE_HELPERS CONVERSATION_DIR = conversation @@ -89,6 +93,5 @@ SUBDIRS = \ exit \ pt \ integration-tests \ - $(EXP_DIR) - -# ats-tests + $(EXP_DIR) \ + $(WACHS_DIR) -- cgit v1.2.3