print active/inactive information

[oweals/gnunet.git] / src / peerinfo / Makefile.am

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 7dd1581c4c80361604fd404b63823251ea7d8f8f..f4e8202536ab6a0332ae668293faa90512631000 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -35,11 +35,11 @@ libexec_PROGRAMS = \
  gnunet-service-peerinfo
 
 gnunet_service_peerinfo_SOURCES = \
- gnunet-service-peerinfo.c         
+ gnunet-service-peerinfo.c
 gnunet_service_peerinfo_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_BENCHMARKS
  PEERINFO_BENCHMARKS = \
@@ -48,16 +48,16 @@ endif
 
 if HAVE_TESTING
 check_PROGRAMS = \
+ test_peerinfo_shipped_hellos \
  test_peerinfo_api \
  test_peerinfo_api_friend_only \
  test_peerinfo_api_notify_friend_only \
- $(PEERINFO_BENCHMARKS) 
+ $(PEERINFO_BENCHMARKS)
 endif
-# test_peerinfo_shipped_hellos 
 
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -67,7 +67,7 @@ test_peerinfo_shipped_hellos_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerinfo_api_SOURCES = \
  test_peerinfo_api.c
@@ -75,7 +75,7 @@ test_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerinfo_api_friend_only_SOURCES = \
  test_peerinfo_api_friend_only.c
@@ -83,7 +83,7 @@ test_peerinfo_api_friend_only_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerinfo_api_notify_friend_only_SOURCES = \
  test_peerinfo_api_notify_friend_only.c
@@ -99,7 +99,7 @@ perf_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
-  test_peerinfo_api_data.conf 
+  test_peerinfo_api_data.conf