get rid of --enable-wachs option, move mlp plugin to experimental-only

4 files changed, 8 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 7f9cc2197..e90485597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1336,15 +1336,6 @@ 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/po/POTFILES.in b/po/POTFILES.in
index 03eca63fa..2594104df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -188,8 +188,6 @@ src/gns/gnunet-gns-proxy.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
 src/gns/gnunet-service-gns_resolver.c
-src/gns/gnunet-service-gns_reverser.c
-src/gns/gnunet-service-gns_shorten.c
 src/gns/nss/nss_gns.c
 src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index cfed92f2b..4811bc8d7 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -13,6 +13,7 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+if HAVE_EXPERIMENTAL
 if HAVE_LIBGLPK
  PERF_MLP = \
  perf_ats_mlp_transport_none \
@@ -22,6 +23,7 @@ if HAVE_LIBGLPK
  perf_ats_mlp_core_bandwidth \
  perf_ats_mlp_core_latency
 endif
+endif
 
 if HAVE_TESTING
 TESTING_TESTS = \
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index af7f6bd58..759dac0be 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -21,14 +21,16 @@ endif
 lib_LTLIBRARIES = libgnunetats.la
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_ats_proportional.la \
-  $(GN_MLP_LIB) \
-  libgnunet_plugin_ats_ril.la
+  libgnunet_plugin_ats_proportional.la
 
+if HAVE_EXPERIMENTAL
+plugin_LTLIBRARIES += \
+  libgnunet_plugin_ats_ril.la
 if HAVE_LIBGLPK
 plugin_LTLIBRARIES += \
   libgnunet_plugin_ats_mlp.la
 endif
+endif
 
 libgnunetats_la_SOURCES = \
   ats_api_connectivity.c \
@@ -54,7 +56,6 @@ libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 
-if HAVE_LIBGLPK
 libgnunet_plugin_ats_mlp_la_SOURCES = \
   plugin_ats_mlp.c
 libgnunet_plugin_ats_mlp_la_LIBADD = \
@@ -64,7 +65,6 @@ libgnunet_plugin_ats_mlp_la_LIBADD = \
 libgnunet_plugin_ats_mlp_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS) \
   -lglpk
-endif
 
 libgnunet_plugin_ats_ril_la_SOURCES = \
   plugin_ats_ril.c
@@ -99,7 +99,7 @@ if HAVE_TESTING
 TESTING_TESTS = \
  test_ats_api_proportional \
  test_ats_reservation_api_proportional
-if HAVE_WACHS
+if HAVE_EXPERIMENTAL
 TESTING_TESTS += \
  test_ats_api_ril
 if HAVE_LIBGLPK