- fix cli arg parse

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

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index f764f2fbe7a26aa0bb71efb84b223a5fa039cad7..e647169c091293eae8c31db0b3754548060ceca4 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,7 +1,9 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 dist_pkgcfg_DATA = \
   hostlist.conf
 
@@ -10,12 +12,14 @@ if USE_COVERAGE
 endif
 
 if HAVE_MHD
- HOSTLIST_SERVER_SOURCES =  hostlist-server.c hostlist-server.h 
+ HOSTLIST_SERVER_SOURCES =  hostlist-server.c hostlist-server.h
  GN_LIBMHD = -lmicrohttpd
 endif
 
-bin_PROGRAMS = \
+if HAVE_LIBGNURL
+libexec_PROGRAMS = \
  gnunet-daemon-hostlist
+endif
 
 gnunet_daemon_hostlist_SOURCES = \
  gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
@@ -30,12 +34,13 @@ gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  @LIBCURL@  \
+  @LIBGNURL@  \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@ 
+ @LIBGNURL_CPPFLAGS@  $(AM_CPPFLAGS)
 
+if HAVE_LIBGNURL
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
@@ -43,24 +48,26 @@ check_PROGRAMS = \
 
 if HAVE_MHD
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
  test_gnunet_daemon_hostlist_learning
 endif
 endif
+endif
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c
 test_gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_daemon_hostlist_reconnect_SOURCES = \
  test_gnunet_daemon_hostlist_reconnect.c
 test_gnunet_daemon_hostlist_reconnect_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_daemon_hostlist_learning_SOURCES = \
  test_gnunet_daemon_hostlist_learning.c
@@ -68,7 +75,7 @@ test_gnunet_daemon_hostlist_learning_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_hostlist_defaults.conf \