From e13aead8a19c65144fc254f9e3a694584ab1777c Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Wed, 3 Aug 2016 22:12:29 +0300
Subject: Reduce ENABLE_OPENGL / ENABLE_HEADLESS confusion

ENABLE_OPENGL means whether to enable the OpenGL slideshow transition
code. It does not mean whether to enable use of OpenGL in general. So
rename it to ENABLE_OPENGL_TRANSITIONS while at it.

ENABLE_HEADLESS means whether to disable use of X11 and OpenGL on X11
(and Wayland) platforms, I think, meaning Linux and maybe Solaris and
the BSDs. Maybe it should be renamed to DISABLE_X11_AND_OPENGL.

Change-Id: Ibb30f51646b1bcc477fe691a3fa38c7a1e3944ae
---
 vcl/CppunitTest_vcl_bitmap_test.mk | 2 +-
 vcl/Executable_icontest.mk         | 2 +-
 vcl/Executable_vcldemo.mk          | 2 +-
 vcl/Library_vcl.mk                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'vcl')

diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk
index 514a8463c1ea..879c7ac5eaa9 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
 	boost_headers \
 	glm_headers \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
      glew \
  ))
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 58efd051b2da..102697b0daa2 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_externals,icontest,\
     boost_headers \
 	glm_headers \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Executable_use_externals,icontest,\
     glew \
 ))
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 6003ecd8e9f3..bff091e2afeb 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\
 	boost_headers \
 	glm_headers \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Executable_use_externals,vcldemo,\
     glew \
 ))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index c2837a19b2f1..904f03508b11 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -122,7 +122,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 	lcms2 \
 	mdds_headers \
 ))
-ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,vcl,\
      glew \
  ))
-- 
cgit