[gnunet] branch master updated (b0ea9e4cc -> e20889e44)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from b0ea9e4cc meson: add most tests and testsuites
     new 7a4332c89 UTIL: Fix incorrect IFCONFIG ifdef
     new e20889e44 meson: detect ip and ifconfig binaries

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 meson.build           | 10 ++++++++++
 src/util/os_network.c |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index f411a71aa..3af63cecc 100644
--- a/meson.build
+++ b/meson.build
@@ -189,6 +189,16 @@ if gopt_bin.found()
   add_project_arguments('-DHAVE_GETOPT_BINARY='+gopt_bin.full_path(), language 
: 'c')
 endif
 
+ifconfig_bin = find_program('ifconfig', '/usr/sbin/ifconfig', required : false)
+if ifconfig_bin.found()
+  cdata.set_quoted('IFCONFIG', ifconfig_bin.full_path())
+endif
+
+ip_bin = find_program('ip', '/usr/sbin/ip', required : false)
+if ip_bin.found()
+  cdata.set_quoted('PATH_TO_IP', ip_bin.full_path())
+endif
+
 pkgc_bin = find_program('pkg-config', '/usr/bin/pkg-config', required : false)
 if pkgc_bin.found()
   add_project_arguments('-DHAVE_PKG_CONFIG', language : 'c')
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 30cc8a7ce..ac9fa691f 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -265,7 +265,7 @@ try_ip (GNUNET_OS_NetworkInterfaceProcessor proc,
   {
     const char *sbin_ip;
 
-#ifdef IFCONFIG
+#ifdef PATH_TO_IP
     if (0 == access (PATH_TO_IP, X_OK))
       sbin_ip = PATH_TO_IP;
     else

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.