X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdns%2FMakefile.am;h=0ef1623f9f01759595e92c6dd240c0ee06c788ad;hb=bfdb0abc074a99a7d24ca408f38cfda128d4132b;hp=efaea0f5080b6bc0b614faf1b0bb1afc7c566945;hpb=9ccfc6d872f48b318ea820c8de0f4bf92e14427a;p=oweals%2Fgnunet.git

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index efaea0f50..0ef1623f9 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -10,6 +10,8 @@ endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 plugindir = $(libdir)/gnunet
 
 pkgcfg_DATA = \
@@ -18,20 +20,17 @@ pkgcfg_DATA = \
 if LINUX
 HIJACKBIN = gnunet-helper-dns
 install-exec-hook:
-	$(SUDO_BINARY) chown root $(bindir)/gnunet-helper-dns || true
-	$(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-helper-dns || true
-	$(SUDO_BINARY) chmod 4750 $(bindir)/gnunet-helper-dns || true
-	$(SUDO_BINARY) chgrp $(GNUNETDNS_GROUP) $(bindir)/gnunet-service-dns || true
-	$(SUDO_BINARY) chmod 2750 $(bindir)/gnunet-service-dns || true
+	$(top_srcdir)/src/dns/install-dns-helper.sh $(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif
 
 lib_LTLIBRARIES = \
   libgnunetdnsparser.la \
+  libgnunetdnsstub.la \
   libgnunetdns.la
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
   gnunet-service-dns $(HIJACKBIN)
 
 noinst_PROGRAMS = \
@@ -40,9 +39,10 @@ noinst_PROGRAMS = \
 plugin_LTLIBRARIES = \
   libgnunet_plugin_block_dns.la 
 
+if LINUX
 check_SCRIPTS = \
  test_gnunet_dns.sh
-
+endif
 
 gnunet_helper_dns_SOURCES = \
  gnunet-helper-dns.c
@@ -73,17 +73,28 @@ gnunet_dns_redirector_DEPENDENCIES = \
 gnunet_service_dns_SOURCES = \
  gnunet-service-dns.c 
 gnunet_service_dns_LDADD = \
+  $(top_builddir)/src/dns/libgnunetdnsstub.la \
   $(top_builddir)/src/tun/libgnunettun.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_service_dns_DEPENDENCIES = \
+  libgnunetdnsstub.la
 
 libgnunetdnsparser_la_SOURCES = \
  dnsparser.c 
 libgnunetdnsparser_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+  -lidn
 libgnunetdnsparser_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) \
+  -version-info 1:0:1
+
+libgnunetdnsstub_la_SOURCES = \
+ dnsstub.c 
+libgnunetdnsstub_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetdnsstub_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
 
@@ -92,7 +103,7 @@ libgnunetdns_la_SOURCES = \
 libgnunetdns_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetdns_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)) \
+  $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
 
 libgnunet_plugin_block_dns_la_SOURCES = \
@@ -104,6 +115,7 @@ libgnunet_plugin_block_dns_la_LDFLAGS = \
 
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif