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 076c450c170c0c9ac6fbd458c8898ef5f5615371..5deb28191a8795bcab6d75ee7b0506b680a02d7b 100644 (file)
--- 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 062cd31c0793168f22e0a4be7e1de504e8734715..b3cf81ed5bfa627bc2659816cd79ba4f89af1feb 100644 (file)
--- 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@