rename ENABLE_HEADLESS option to DISABLE_GUI

since it has nothing to do with the headless command line option, so use the name it has in the configure.ac file Change-Id: Ibf0615ed02695d6e48a797f5632e4f417c010c70 Reviewed-on: https://gerrit.libreoffice.org/59611 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-26 17:22:56 +02:00
parent e6f4779de8
commit 2b5812e019
33 changed files with 46 additions and 46 deletions
--- a/Repository.mk
+++ b/Repository.mk
@@ -200,7 +200,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 	$(if $(filter WNT,$(OS)),,uri-encode) \
 	$(if $(ENABLE_MACOSX_SANDBOX),, \
-		$(if $(ENABLE_HEADLESS),, \
+		$(if $(DISABLE_GUI),, \
 			ui-previewer \
 		) \
 	) \
@@ -429,7 +429,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	slideshow \
 	sot \
 	spell \
-	$(if $(ENABLE_HEADLESS),,spl) \
+	$(if $(DISABLE_GUI),,spl) \
 	storagefd \
 	$(call gb_Helper_optional,SCRIPTING,stringresource) \
 	svgio \
@@ -962,7 +962,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\

 $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
 	extras_fonts \
-	$(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \
+	$(if $(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)), \
 		postprocess_fontconfig) \
 	$(call gb_Helper_optional,MORE_FONTS,\
 		fonts_alef \
@@ -1017,7 +1017,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
 	$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
 	$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
-		$(if $(ENABLE_HEADLESS),, \
+		$(if $(DISABLE_GUI),, \
 			desktop_soffice_sh \
 		) \
 	) \
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1220,7 +1220,7 @@ endif # ANDROID
 endif # SYSTEM_REDLAND


-ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(ENABLE_HEADLESS),) # or
+ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(DISABLE_GUI),) # or

 ifneq ($(SYSTEM_CAIRO),)

--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
 	boost_headers \
 ))

-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
    epoxy \
 ))
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\
 	boost_headers \
 ))

-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,chartcore,\
    epoxy \
 ))
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -141,7 +141,7 @@ export ENABLE_GSTREAMER_1_0=@ENABLE_GSTREAMER_1_0@
 export ENABLE_GTK3=@ENABLE_GTK3@
 export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
-export ENABLE_HEADLESS=@ENABLE_HEADLESS@
+export DISABLE_GUI=@DISABLE_GUI@
 export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@
 export ENABLE_JAVA=@ENABLE_JAVA@
 export ENABLE_KDE4=@ENABLE_KDE4@
--- a/configure.ac
+++ b/configure.ac
@@ -4413,17 +4413,17 @@ if test "$with_x" = "no"; then
    AC_MSG_ERROR([Use --disable-gui instead. How can we get rid of this option? No idea where it comes from.])
 fi

-ENABLE_HEADLESS=""
+DISABLE_GUI=""
 if test "$enable_gui" = "no"; then
    if test "$USING_X11" != TRUE; then
        AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --disable-gui.])
    fi
    USING_X11=
-    ENABLE_HEADLESS=TRUE
+    DISABLE_GUI=TRUE
    AC_DEFINE(HAVE_FEATURE_UI,0)
    test_cairo=yes
 fi
-AC_SUBST(ENABLE_HEADLESS)
+AC_SUBST(DISABLE_GUI)

 WORKDIR="${BUILDDIR}/workdir"
 INSTDIR="${BUILDDIR}/instdir"
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -69,7 +69,7 @@ $(eval $(call gb_Library_use_externals,cui,\
    icuuc \
    icu_headers \
 ))
-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,cui,\
     epoxy \
 ))
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\

 endif

-ifneq ($(ENABLE_HEADLESS),TRUE)
+ifneq ($(DISABLE_GUI),TRUE)

 ifneq ($(OS),WNT)
 $(eval $(call gb_Executable_add_libs,oosplash,\
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -123,7 +123,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
    desktop/source/migration/migration \
 ))

-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Library_add_libs,sofficeapp,\
 	-lm $(DLOPEN_LIBS) \
 	-lpthread \
@@ -161,7 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 	desktop/source/lib/lokclipboard \
 ))
 endif
-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
    desktop/source/lib/init \
    desktop/source/lib/lokinteractionhandler \
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
    $(if $(ENABLE_BREAKPAD), \
        Library_crashreport \
        ) \
-    $(if $(ENABLE_HEADLESS),,Library_spl) \
+    $(if $(DISABLE_GUI),,Library_spl) \
    Package_branding \
    $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
    UIConfig_deployment \
--- a/emfio/CppunitTest_emfio_wmf_test.mk
+++ b/emfio/CppunitTest_emfio_wmf_test.mk
@@ -85,7 +85,7 @@ $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
    icuuc \
    lcms2 \
 ))
-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
     epoxy \
 ))
@@ -119,7 +119,7 @@ $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
 ))
 endif

-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_CppunitTest_use_externals,emfio_wmf,\
    cairo \
    freetype \
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
 		$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \
-		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(ENABLE_HEADLESS)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
+		$(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
 		$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
 		--disable-valgrind \
 		$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -34,7 +34,7 @@ endif
 # contain content from at least one of external/more_fonts/fc_local.snippet
 # (conditional on MORE_FONTS in BUILD_TYPE) and
 # extras/source/truetype/symbol/fc_local.snippet (unconditional):
-ifneq ($(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)),)
+ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,postprocess, \
    CustomTarget_fontconfig \
    Package_fontconfig \
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -150,7 +150,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 		shell/source/win32/syssh \
 		vcl/vcl.windows \
 	) \
-	$(if $(ENABLE_HEADLESS), \
+	$(if $(DISABLE_GUI), \
 		vcl/vcl.headless \
 	) \
 	$(if $(filter ANDROID,$(OS)), \
@@ -298,7 +298,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	desktop/source/migration/services/migrationoo2 \
 	desktop/source/migration/services/migrationoo3 \
 	desktop/source/offacc/offacc \
-	$(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \
+	$(if $(DISABLE_GUI),,desktop/source/splash/spl) \
 	extensions/source/abpilot/abp \
 	extensions/source/config/ldap/ldapbe2 \
 	$(if $(filter WNT,$(OS)),\
@@ -315,7 +315,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 		shell/source/unix/exec/syssh \
 	) \
 	$(if $(filter-out MACOSX WNT,$(OS)), \
-		$(if $(ENABLE_HEADLESS),, \
+		$(if $(DISABLE_GUI),, \
 			shell/source/backends/desktopbe/desktopbe1 \
 			vcl/vcl.unx \
 		) \
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 	CppunitTest_sc_cache_test \
 ))

-ifneq ($(ENABLE_HEADLESS),TRUE)
+ifneq ($(DISABLE_GUI),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,sc,\
 	CppunitTest_sc_tiledrendering \
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sd,\
 ))
 endif

-ifneq ($(ENABLE_HEADLESS),TRUE)
+ifneq ($(DISABLE_GUI),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_slowcheck_targets,sd,\
    CppunitTest_sd_svg_export_tests \
--- 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_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,slideshow,\
     epoxy \
 ))
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -20,7 +20,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
 	RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \
 	$(call gb_Helper_print_on_error,\
-		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
+		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \
 			SAL_USE_VCLPLUGIN=svp \
 		)) \
 		$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -52,7 +52,7 @@ else
 		UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \
 		TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \
 		PYTHONDONTWRITEBYTECODE=1 \
-		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
+		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \
 			SAL_USE_VCLPLUGIN=svp \
 		)) \
 		$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -69,7 +69,7 @@ else
 		PYTHONPATH="$(PYPATH)" \
 		TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*)))" \
 		PYTHONDONTWRITEBYTECODE=0 \
-		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
+		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(DISABLE_GUI),, \
 			SAL_USE_VCLPLUGIN=svp \
 		)) \
 		$(gb_UITest_COMMAND) \
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -42,7 +42,7 @@ MERGE_LIBRARY_LIST := \
 	sfx \
 	sofficeapp \
 	sot \
-	$(if $(ENABLE_HEADLESS),,spl) \
+	$(if $(DISABLE_GUI),,spl) \
 	svl \
 	svt \
 	svx \
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -227,7 +227,7 @@ gb_GLOBALDEFS += -DDEBUG \
 endif
 endif

-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 gb_GLOBALDEFS += -DLIBO_HEADLESS \

 endif
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_Executable_use_system_win32_libs,gengal,\
 ))
 endif

-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Executable_add_libs,gengal,\
 	$(DLOPEN_LIBS) \
 	-lpthread \
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 	libxml2 \
 	$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,svxcore,\
     epoxy \
 ))
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
    uui/util/uui \
    vcl/vcl.common \
    $(if $(filter-out MACOSX WNT,$(OS)), \
-        $(if $(ENABLE_HEADLESS),, \
+        $(if $(DISABLE_GUI),, \
            vcl/vcl.unx \
        ) \
    ) \
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
    unoxml/source/service/unoxml \
    uui/util/uui \
    $(if $(filter-out MACOSX WNT,$(OS)), \
-		$(if $(ENABLE_HEADLESS),, \
+		$(if $(DISABLE_GUI),, \
 			vcl/vcl.unx \
 		) \
    ) \
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -97,7 +97,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
    CppunitTest_sw_unowriter \
 ))

-ifneq ($(ENABLE_HEADLESS),TRUE)
+ifneq ($(DISABLE_GUI),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
    CppunitTest_sw_tiledrendering \
--- 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_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,tk,\
    epoxy \
 ))
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
 	boost_headers \
 	glm_headers \
 ))
-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
     epoxy \
 ))
--- 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_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Executable_use_externals,icontest,\
    epoxy \
 ))
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\
 	glm_headers \
 	harfbuzz \
 ))
-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Executable_use_externals,vcldemo,\
    epoxy \
 ))
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -29,7 +29,7 @@ else ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android))
 else ifeq ($(OS),IOS)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios))
-else ifeq ($(ENABLE_HEADLESS),TRUE)
+else ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless))
 else
 $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
@@ -122,7 +122,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
    lcms2 \
    mdds_headers \
 ))
-ifeq ($(ENABLE_HEADLESS),)
+ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,vcl,\
     epoxy \
 ))
@@ -613,7 +613,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 ))
 endif

-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
    vcl/unx/generic/printer/jobdata \
    vcl/unx/generic/printer/ppdparser \
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -28,11 +28,11 @@ $(eval $(call gb_Module_add_targets,vcl,\
    $(if $(filter DESKTOP,$(BUILD_TYPE)), \
        StaticLibrary_vclmain \
 		$(if $(ENABLE_MACOSX_SANDBOX),, \
-			$(if $(ENABLE_HEADLESS),, \
+			$(if $(DISABLE_GUI),, \
 				Executable_ui-previewer)) \
 		$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
 			Executable_outdevgrind \
-			$(if $(ENABLE_HEADLESS),, \
+			$(if $(DISABLE_GUI),, \
 				Executable_vcldemo \
 				Executable_icontest \
 				Executable_visualbackendtest \
@@ -224,7 +224,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
 ))
 endif

-ifeq ($(ENABLE_HEADLESS),TRUE)
+ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Module_add_check_targets,vcl,\
 	CppunitTest_vcl_timer \
 ))