gnunet

commit 3c09eea17b954f11cf8c1479d39284e8a2356d5c
parent d0c4105c48335034a0989ef7b0152c35c39c3bd4
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 20 Dec 2013 17:02:38 +0000

-fix nss installation invocation if nss is not to be installed

Diffstat:
M
src/dv/test_transport_dv_data.conf
 | 
1
+
M
src/gns/nss/Makefile.am
 | 
3
+++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
@@ -16,3 +16,4 @@ AUTOSTART = YES
 [core]
 # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 
+
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am
@@ -51,6 +51,7 @@ libnss_gns6_la_SOURCES=$(libnss_gns_la_SOURCES)
 libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1
 libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
 
+if INSTALL_NSS
 if !MINGW
 install-data-hook:
 	$(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(nssdir) $(SUDO_BINARY)
@@ -60,3 +61,4 @@ uninstall-hook:
 	$(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY)
 	$(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY)
 endif
+endif
+\ No newline at end of file