-simplify

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

diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 8af1d4a7fedda00fca2409d4880194ab457e8f01..726251aec03851ac6f04c1a3e2aea947a1d3221c 100644 (file)
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -1,5 +1,12 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+dist_pkgcfg_DATA = \
+  hostlist.conf
+
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -9,8 +16,10 @@ if HAVE_MHD
  GN_LIBMHD = -lmicrohttpd
 endif
 
-bin_PROGRAMS = \
+if HAVE_LIBCURL
+libexec_PROGRAMS = \
  gnunet-daemon-hostlist
+endif
 
 gnunet_daemon_hostlist_SOURCES = \
  gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
@@ -31,6 +40,7 @@ gnunet_daemon_hostlist_LDADD = \
 gnunet_daemon_hostlist_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@ 
 
+if HAVE_LIBCURL
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
@@ -44,6 +54,7 @@ TESTS = \
  test_gnunet_daemon_hostlist_learning
 endif
 endif
+endif
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c