From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 29 Aug 2018 20:29:45 +0000 (-0700)
Subject: open-vm-tools: build without libdnet by default
X-Git-Tag: stable-11.0.0~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f52cd6f278aae31d72cd018655b31978ee53bba;p=thirdparty%2Fopen-vm-tools.git

open-vm-tools: build without libdnet by default

Building with libdnet does not add any value for Linux, so build
without it by default, but keep the option open to fall back on
it if there are issues.

FreeBSD still needs libdnet for full functionality, therefore
make building without it the default only for Linux.
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index ee39edf89..46e290e3d 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -922,11 +922,17 @@ AC_ARG_WITH([pam-prefix],
 	    [PAM_PREFIX="$withval"],
 	    [if test "$os" = "freebsd" ; then PAM_PREFIX='$(sysconfdir)'; else PAM_PREFIX='/etc'; fi])
 
+if test "$os" = "linux"; then
+   with_dnet_dflt="no"
+else
+   with_dnet_dflt="yes"
+fi
+
 AC_ARG_WITH([dnet],
-	    [AS_HELP_STRING([--without-dnet],
-	    [compiles without libdnet (disables support for nicinfo)])],
+	    [AS_HELP_STRING([--with-dnet],
+	    [specifies whether to build with libdnet - the default is without for Linux, and with it otherwise])],
 	    [],
-	    [with_dnet=yes])
+	    [with_dnet="$with_dnet_dflt"])
 
 have_dnet="no"
 if test "$with_dnet" = "yes"; then
@@ -958,7 +964,7 @@ if test "$with_dnet" = "yes"; then
 
    if test $have_dnet = "no"; then
 		AC_MSG_ERROR(
-		   [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net])
+		   [dnet-config was not found on your PATH. Please configure without dnet or install dnet - http://libdnet.sourceforge.net])
    fi
 fi