From: VMware, Inc <>
Date: Fri, 12 Apr 2013 19:47:45 +0000 (-0700)
Subject: OVT: disable compiling VMCI/VSOCK on kernels 3.9 and above
X-Git-Tag: 2013.04.16-1098359~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d727aa9656ce2b37f3ffa3e6b434cc5596ccc4c0;p=thirdparty%2Fopen-vm-tools.git

OVT: disable compiling VMCI/VSOCK on kernels 3.9 and above

Starting with 3.9 our VMCI and VSOCK modules are in mainline kernel
so we do not need to compile them as out-of-tree ones.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index d8c561e82..cdaa2e5d2 100644
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -945,8 +945,12 @@ if test "$os" = "linux"; then
 
    LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lrt"
 
-   MODULES="$MODULES vmci vsock"
    MODULES="$MODULES vmxnet vmhgfs"
+   # See if we need vmci and vsock modules. Starting with 3.9 they made
+   # their way into mainline kernel.
+   if test "$osVersion" -lt 309000; then
+      MODULES="$MODULES vmci vsock"
+   fi
    if test "$osVersion" -lt 300000; then
       MODULES="$MODULES vmblock vmsync"
    fi