[GNUnet-SVN] r31626 - in gnunet/src: dv gns/nss

[gnunet]

Author: grothoff
Date: 2013-12-20 18:02:38 +0100 (Fri, 20 Dec 2013)
New Revision: 31626

Modified:
   gnunet/src/dv/test_transport_dv_data.conf
   gnunet/src/gns/nss/Makefile.am
Log:
-fix nss installation invocation if nss is not to be installed

Modified: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf   2013-12-20 16:37:19 UTC (rev 
31625)
+++ gnunet/src/dv/test_transport_dv_data.conf   2013-12-20 17:02:38 UTC (rev 
31626)
@@ -16,3 +16,4 @@
 [core]
 # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 
+

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2013-12-20 16:37:19 UTC (rev 31625)
+++ gnunet/src/gns/nss/Makefile.am      2013-12-20 17:02:38 UTC (rev 31626)
@@ -51,6 +51,7 @@
 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 @@
        $(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