[GNUnet-SVN] r21661 - in gnunet: . src/gns/nss src/integration-tests

[gnunet]

Author: grothoff
Date: 2012-05-31 20:04:28 +0200 (Thu, 31 May 2012)
New Revision: 21661

Modified:
   gnunet/configure.ac
   gnunet/src/gns/nss/Makefile.am
   gnunet/src/integration-tests/Makefile.am
Log:
-allow installation even as non-root non-sudo user to succeed with new nss code

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-05-31 17:12:40 UTC (rev 21660)
+++ gnunet/configure.ac 2012-05-31 18:04:28 UTC (rev 21661)
@@ -766,8 +766,8 @@
   ],
   [AC_MSG_RESULT([no])])
 AC_SUBST(SUDO_BINARY)
+AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /])
 
-
 # test for gnunetdns group name
 GNUNETDNS_GROUP=gnunetdns
 AC_MSG_CHECKING(for gnunetdns group name)
@@ -1104,6 +1104,11 @@
   AC_MSG_NOTICE([NOTICE: Mac OS X framework build enabled.])
 fi
 
+if test "x$SUDO_BINARY" = "x" -a ! -w /
+then
+  AC_MSG_NOTICE([NOTICE: --with-sudo not specified and not running as 'root', 
will not install GNS NSS library])
+fi
+
 AC_MSG_NOTICE([********************************************
 You can compile GNUnet with
        make

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2012-05-31 17:12:40 UTC (rev 21660)
+++ gnunet/src/gns/nss/Makefile.am      2012-05-31 18:04:28 UTC (rev 21661)
@@ -21,15 +21,22 @@
 
 AM_LDFLAGS=-avoid-version -module -export-dynamic
 
+if HAVE_SUDO
 nssdir = /lib/
+else
+nssdir = $(libdir)
+endif
+
 LIBTOOL = $(SUDO_BINARY) $(SHELL) $(top_builddir)/libtool
 
 if !MINGW
+if HAVE_SUDO
 nss_LTLIBRARIES = \
        libnss_gns.la \
        libnss_gns4.la \
        libnss_gns6.la
 endif
+endif
 
 sources = util.c util.h query.h query.c
 

Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2012-05-31 17:12:40 UTC (rev 
21660)
+++ gnunet/src/integration-tests/Makefile.am    2012-05-31 18:04:28 UTC (rev 
21661)
@@ -12,8 +12,6 @@
 #bin_PROGRAMS = \
 # connection_watchdog
 
-check_PROGRAMS =
-
 noinst_PROGRAMS = connection_watchdog
 
 noinst_SCRIPTS = \
@@ -98,7 +96,7 @@
 test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > 
test_integration_clique_nat.py
        chmod +x test_integration_clique_nat.py 
-       
+
 test_integration_connect_on_restart.py: 
test_integration_connect_on_restart.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_connect_on_restart.py.in > 
test_integration_connect_on_restart.py
        chmod +x test_integration_connect_on_restart.py