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
2016-08-03 22:12:29 +03:00 · 2016-08-03 22:12:29 +03:00 · e13aead8a1
commit e13aead8a1
parent 1520d30268
17 changed files with 28 additions and 30 deletions
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@ -27,7 +27,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
 	boost_headers \
 ))

-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,avmedia,\
    glew \
 ))
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@ -30,7 +30,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\
 	glm_headers \
 ))

-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,chartcore,\
    glew \
 ))
@ -119,7 +119,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
    chart2/source/view/main/VPolarTransformation \
    chart2/source/view/main/VTitle \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
    chart2/source/view/main/3DChartObjects \
    chart2/source/view/main/GL3DPlotterBase \
@ -264,12 +264,12 @@ else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,chartcore,\
 	$(DLOPEN_LIBS) \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_add_libs,chartcore,\
    -lGL \
    -lX11 \
 ))
-endif #ENABLE_OPENGL
+endif #!ENABLE_HEADLESS

 endif

--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
    Library_chartcontroller \
    Library_chartcore \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Module_add_targets,chart2,\
     Library_chartopengl \
     Package_opengl \
--- a/config_host.mk.in
+++ b/config_host.mk.in
@ -159,7 +159,7 @@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
 export ENABLE_ONLINE_UPDATE_MAR=@ENABLE_ONLINE_UPDATE_MAR@
 export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
-export ENABLE_OPENGL=@ENABLE_OPENGL@
+export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
--- a/configure.ac
+++ b/configure.ac
@ -10451,29 +10451,29 @@ else
 fi
 AC_SUBST(ENABLE_VLC)

-# this is for opengl transitions in impress slideshow
-ENABLE_OPENGL=
+ENABLE_OPENGL_TRANSITIONS=
+ENABLE_OPENGL_CANVAS=
 if test $_os = iOS -o $_os = Android; then
   : # disable
 elif test "$_os" = "Darwin"; then
    # We use frameworks on Mac OS X, no need for detail checks
-    ENABLE_OPENGL=TRUE
+    ENABLE_OPENGL_TRANSITIONS=TRUE
    AC_DEFINE(HAVE_FEATURE_OPENGL,1)
    ENABLE_OPENGL_CANVAS=TRUE
 elif test $_os = WINNT; then
-    ENABLE_OPENGL=TRUE
+    ENABLE_OPENGL_TRANSITIONS=TRUE
    AC_DEFINE(HAVE_FEATURE_OPENGL,1)
    ENABLE_OPENGL_CANVAS=TRUE
 else
    if test "$USING_X11" = TRUE; then
        AC_CHECK_LIB(GL, glBegin, [:], AC_MSG_ERROR([libGL required.]))
-        ENABLE_OPENGL=TRUE
+        ENABLE_OPENGL_TRANSITIONS=TRUE
        AC_DEFINE(HAVE_FEATURE_OPENGL,1)
        ENABLE_OPENGL_CANVAS=TRUE
    fi
 fi

-AC_SUBST(ENABLE_OPENGL)
+AC_SUBST(ENABLE_OPENGL_TRANSITIONS)
 AC_SUBST(ENABLE_OPENGL_CANVAS)

 dnl =================================================
@ -12838,7 +12838,7 @@ if test "$enable_mpl_subset" = "yes"; then
        esac
    done

-    ENABLE_OPENGL=
+    ENABLE_OPENGL_TRANSITIONS=

    if test "$enable_lpsolve" != "no" -o "x$ENABLE_LPSOLVE" = "xTRUE"; then
        AC_MSG_ERROR([need to --disable-lpsolve - calc linear programming solver.])
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@ -70,7 +70,7 @@ $(eval $(call gb_Library_use_externals,cui,\
    icuuc \
    icu_headers \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,cui,\
     glew \
 ))
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@ -441,7 +441,7 @@ postprocess_FILES_onlineupdate := \
 	$(call gb_XcuModuleTarget_get_target,extensions/source/update/check)/org/openoffice/Office/Jobs-onlineupdate.xcu
 endif

-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL_TRANSITIONS),TRUE)
 postprocess_XCDS += ogltrans.xcd
 postprocess_DEPS_ogltrans := main
 postprocess_FILES_ogltrans := \
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@ -213,7 +213,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 		extensions/source/update/check/updchk.uno \
 		extensions/source/update/ui/updchk \
 	) \
-	$(if $(ENABLE_OPENGL), \
+	$(if $(ENABLE_OPENGL_TRANSITIONS), \
 		slideshow/source/engine/OGLTrans/ogltrans \
 	) \
 	$(if $(ENABLE_TDE), \
@ -229,11 +229,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 		wizards/com/sun/star/wizards/report/report \
 		wizards/com/sun/star/wizards/table/table \
 	) \
-    $(if $(ENABLE_OPENGL), \
    $(if $(ENABLE_GLTF), \
 		$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
 	) \
-	) \
 ))

 ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
--- a/scp2/InstallModule_impress.mk
+++ b/scp2/InstallModule_impress.mk
@ -28,7 +28,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
 ))

 $(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
-	$(if $(filter TRUE,$(ENABLE_OPENGL)),\
+	$(if $(filter TRUE,$(ENABLE_OPENGL_TRANSITIONS)),\
 		scp2/source/impress/module_ogltrans \
 	) \
 ))
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in
 $(eval $(call gb_Library_use_externals,slideshow,\
 	boost_headers \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,slideshow,\
     glew \
 ))
--- a/slideshow/Module_slideshow.mk
+++ b/slideshow/Module_slideshow.mk
@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,slideshow))
 $(eval $(call gb_Module_add_targets,slideshow,\
    Library_slideshow \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_OPENGL_TRANSITIONS),TRUE)
 $(eval $(call gb_Module_add_targets,slideshow,\
    Library_OGLTrans \
    Package_opengl \
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 	icu_headers \
 	libxml2 \
 ))
-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,svxcore,\
     glew \
 ))
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_externals,tk,\
    boost_headers \
 ))

-ifeq ($(ENABLE_OPENGL),TRUE)
+ifeq ($(ENABLE_HEADLESS),)
 $(eval $(call gb_Library_use_externals,tk,\
    glew \
 ))
--- 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 \
 ))
--- 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 \
 ))
--- 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 \
 ))
--- 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 \
 ))