aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-03-07 11:13:19 +0000
committerChristian Grothoff <christian@grothoff.org>2015-03-07 11:13:19 +0000
commit302ba9e8f253dc4c1c8dd356c0b86d4864427047 (patch)
tree6f7bff84b166bb3c4edc004b7d186dab93081477
parent21508561fc6c11fdf5d32d09b8e55c3750932507 (diff)
downloadgnunet-302ba9e8f253dc4c1c8dd356c0b86d4864427047.tar.gz
gnunet-302ba9e8f253dc4c1c8dd356c0b86d4864427047.zip
add --enable-wachs option
-rw-r--r--configure.ac9
-rw-r--r--src/Makefile.am11
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],
1207AC_MSG_RESULT($enable_experimental) 1207AC_MSG_RESULT($enable_experimental)
1208AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) 1208AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
1209 1209
1210# FTBFS right now...
1211AC_MSG_CHECKING(whether to compile ATS test code)
1212AC_ARG_ENABLE([wachs],
1213 [AS_HELP_STRING([--enable-wachs], [enable compiling ATS test code])],
1214 [enable_wachs=${enableval}],
1215 [enable_wachs=no])
1216AC_MSG_RESULT($enable_wachs)
1217AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"])
1218
1210# should malicious code be compiled (should only be used for testing)? 1219# should malicious code be compiled (should only be used for testing)?
1211AC_MSG_CHECKING(whether to compile malicious code) 1220AC_MSG_CHECKING(whether to compile malicious code)
1212AC_ARG_ENABLE([malicious], 1221AC_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
24 $(CONSENSUS) \ 24 $(CONSENSUS) \
25 $(SECRETSHARING) \ 25 $(SECRETSHARING) \
26 $(SENSOR) \ 26 $(SENSOR) \
27 $(SENSORDASHBOARD) 27 $(SENSORDASHBOARD) \
28endif 28endif
29 29
30if HAVE_WACHS
31 WACHS_DIR = \
32 ats-tests
33endif
30 34
31if BUILD_PULSE_HELPERS 35if BUILD_PULSE_HELPERS
32CONVERSATION_DIR = conversation 36CONVERSATION_DIR = conversation
@@ -89,6 +93,5 @@ SUBDIRS = \
89 exit \ 93 exit \
90 pt \ 94 pt \
91 integration-tests \ 95 integration-tests \
92 $(EXP_DIR) 96 $(EXP_DIR) \
93 97 $(WACHS_DIR)
94# ats-tests