From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:22 +0000 (-0700)
Subject: Consume VMware Tools Header files from Tools build.
X-Git-Tag: stable-10.2.0~369
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=472477d674909ac24767dc1441187f790ce8d31b;p=thirdparty%2Fopen-vm-tools.git

Consume VMware Tools Header files from Tools build.

The 'tools' build component publishes the VMware Tools header file as
'vmtools_version.h'. All products / components which consume 'tools'
should be built with the header file published by the 'tools' build
instead of the one archived in the include directory.
---

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index b92d066d0..dbd9f0619 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -17,6 +17,12 @@
  *********************************************************/
 
 
+#ifdef USE_GOBUILD_TOOLS_VERSION
+
+#include "vmtools_version.h"
+
+#else
+
 #ifndef VM_TOOLS_VERSION_H
 #define VM_TOOLS_VERSION_H
 
@@ -1445,3 +1451,5 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
    TOOLS_VERSION_CURRENT_STR "." PRODUCT_BUILD_NUMBER_NUMERIC_STRING
 
 #endif /* VM_TOOLS_VERSION_H */
+
+#endif /* USE_GOBUILD_TOOLS_VERSION */