[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: Issue 5352 'iptables is har
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: Issue 5352 'iptables is hardcoded': Check for iptables (and ifconfig) in $PATH during the configure phase of the build process. This also creates a variable of the full path to iptables. Next step is to replace the hardcoded path with this variable in the code. |
Date: |
Sun, 24 Jun 2018 11:45:40 +0200 |
This is an automated email from the git hooks/post-receive script.
dvn pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 6661aa497 Issue 5352 'iptables is hardcoded': Check for iptables (and
ifconfig) in $PATH during the configure phase of the build process. This also
creates a variable of the full path to iptables. Next step is to replace the
hardcoded path with this variable in the code.
6661aa497 is described below
commit 6661aa497507a4843712946b454551fabaa666b5
Author: dvn <address@hidden>
AuthorDate: Sat Jun 23 23:34:46 2018 +0200
Issue 5352 'iptables is hardcoded': Check for iptables (and ifconfig) in
$PATH during the configure phase of the build process. This also creates a
variable of the full path to iptables. Next step is to replace the hardcoded
path with this variable in the code.
---
configure.ac | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index c6910c1de..204859556 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,11 +198,24 @@ AC_CHECK_LIB(c, getloadavg,
AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported]))
AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false)
AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY)
-AC_CHECK_PROG(VAR_SSH_BINARY,ssh,true,false)
+AC_CHECK_PROG(VAR_SSH_BINARY, ssh, true, false)
AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY)
AM_CONDITIONAL(HAVE_SSH_KEY, ssh -D 12345 -o "BatchMode yes" -o
"UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o
"StrictHostKeyChecking no" 127.0.0.1 echo -n)
rm -f /tmp/gnunet_test_cosks_ssh_garbage
+# iptables is a soft requirement to run tests
+AC_PATH_TARGET_TOOL(VAR_IPTABLES_BINARY, iptables, false)
+
+if test x"$VAR_IPTABLES_BINARY" != x"false"
+then
+AC_DEFINE_UNQUOTED([IPTABLES], "$VAR_IPTABLES_BINARY", [Path to iptables])
+else
+AC_MSG_WARN([warning: 'iptables' not found.])
+fi
+
+
+AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false)
+AC_MSG_WARN([warning: 'ifconfig' not found.])
AC_CHECK_MEMBER(struct tm.tm_gmtoff,
[AC_DEFINE(HAVE_TM_GMTOFF, 1,
@@ -1768,6 +1781,18 @@ then
AC_MSG_NOTICE([WARNING: jansson library not found. json support will not be
compiled.])
fi
+# warn user if iptables is not found
+if test "$VAR_IPTABLES_BINARY" = "false"
+then
+AC_MSG_NOTICE([WARNING: iptables not found. some modules may not have full
functionality.])
+fi
+
+# warn user if ifconfig is not found
+if test "$VAR_IFCONFIG_BINARY" = "false"
+then
+AC_MSG_NOTICE([WARNING: ifconfig not found. some modules may not have full
functionality.])
+fi
+
#gnutls
if test x$gnutls != xtrue
then
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: Issue 5352 'iptables is hardcoded': Check for iptables (and ifconfig) in $PATH during the configure phase of the build process. This also creates a variable of the full path to iptables. Next step is to replace the hardcoded path with this variable in the code.,
gnunet <=