From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:18 +0000 (-0700)
Subject: Build resolutionCommon when KMS is enabled
X-Git-Tag: stable-10.2.0~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c0d8f2f48560d74f11ae6fdb37a5ff535dba6b;p=thirdparty%2Fopen-vm-tools.git

Build resolutionCommon when KMS is enabled

When ./configure is called with the '--without-x' option,
the resolutionKMS plugin failed to build because disabling
X disabled resolutionCommon as well. This changes enables
resolutionCommon when either X or KMS are enabled, or both.
---

diff --git a/open-vm-tools/services/plugins/Makefile.am b/open-vm-tools/services/plugins/Makefile.am
index 076c450c1..5deb28191 100644
--- a/open-vm-tools/services/plugins/Makefile.am
+++ b/open-vm-tools/services/plugins/Makefile.am
@@ -35,7 +35,12 @@ if HAVE_X11
    SUBDIRS += resolutionSet
 endif
 if ENABLE_RESOLUTIONKMS
-   SUBDIRS += resolutionKMS
+if !HAVE_X11
+# resolutionKMS needs resolutionCommon, which lives in
+# the resolutionSet sub directory
+   SUBDIRS += resolutionSet
+endif
+SUBDIRS += resolutionKMS
 endif
 SUBDIRS += timeSync
 SUBDIRS += vix
diff --git a/open-vm-tools/services/plugins/resolutionSet/Makefile.am b/open-vm-tools/services/plugins/resolutionSet/Makefile.am
index 062cd31c0..b3cf81ed5 100644
--- a/open-vm-tools/services/plugins/resolutionSet/Makefile.am
+++ b/open-vm-tools/services/plugins/resolutionSet/Makefile.am
@@ -16,9 +16,11 @@
 ################################################################################
 
 plugindir = @VMUSR_PLUGIN_INSTALLDIR@
-plugin_LTLIBRARIES = libresolutionSet.la
 noinst_LTLIBRARIES = libresolutionCommon.la
 
+if HAVE_X11
+plugin_LTLIBRARIES = libresolutionSet.la
+
 libresolutionSet_la_CPPFLAGS =
 libresolutionSet_la_CPPFLAGS += @GTK_CPPFLAGS@
 libresolutionSet_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
@@ -39,6 +41,7 @@ libresolutionSet_la_SOURCES += libvmwarectrl.c
 libresolutionSet_la_SOURCES += resolutionSet.c
 libresolutionSet_la_SOURCES += resolutionX11.c
 libresolutionSet_la_SOURCES += resolutionRandR12.c
+endif
 
 libresolutionCommon_la_CPPFLAGS =
 libresolutionCommon_la_CPPFLAGS += @PLUGIN_CPPFLAGS@