From e67688c0a717e662773f67a485a767fe2db17da1 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 26 Feb 2017 02:52:03 +0100
Subject: get rid of --enable-wachs option, move mlp plugin to
 experimental-only

---
 src/ats/Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/ats')

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
-- 
cgit v1.2.3