adding configure code for --enable-benchmarks, --enable-expensive-tests, some clean up

1 files changed, 6 insertions, 2 deletions

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 116095f2a..d58425730 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -33,12 +33,16 @@ gnunet_service_peerinfo_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+if HAVE_BENCHMARKS
+ PEERINFO_BENCHMARKS = \
+ perf_peerinfo_api
+endif
 
 check_PROGRAMS = \
  test_peerinfo_api \
- perf_peerinfo_api
+ $(PEERINFO_BENCHMARKS) 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif