Replace GUIBASE with USING_X11

That's what it actually means. Also make it a boolean

Change-Id: I249e18351253b34b5dada28e2a9c6bc0c06b730c
Reviewed-on: https://gerrit.libreoffice.org/18688Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

Repository.mk

@@ -145,8 +145,8 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
 
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
-	$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
-	$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
+	$(if $(filter TRUE-TRUE,$(USING_X11)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
+	$(if $(ENABLE_TDE),tdefilepicker) \
 	$(if $(filter WNT,$(OS)),,uri-encode) \
 	ui-previewer \
 	$(if $(filter WNT,$(OS)), \
@@ -166,7 +166,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,python, \
 	) \
 ))
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11), TRUE)
 $(eval $(call gb_Helper_register_executables_for_install,OOO,gnome, \
 	$(if $(ENABLE_GTK),\
 		xid-fullscreen-on-all-monitors \
@@ -252,7 +252,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
 	$(if $(ENABLE_KDE4),kde4be1) \
-	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+	$(if $(USING_X11), \
 		$(if $(ENABLE_KDE4),vclplug_kde4) \
 	) \
 ))
@@ -302,7 +302,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 		dbaxml) \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-	$(if $(filter unx,$(GUIBASE)),desktop_detector) \
+	$(if $(USING_X11),desktop_detector) \
 	$(call gb_Helper_optional,SCRIPTING,dlgprov) \
 	$(if $(ENABLE_DIRECTX),directx9canvas) \
 	$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
@@ -424,7 +424,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	) \
 	vcl \
 	vclcanvas \
-	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+	$(if $(USING_X11), \
 		vclplug_gen \
 		$(if $(ENABLE_TDE),vclplug_tde) \
 	) \
@@ -589,7 +589,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	) \
 	$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
 	package2 \
-	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \
+	$(if $(USING_X11),recentfile) \
 	$(call gb_Helper_optional,SCRIPTING,scriptframe) \
 	sdbc2 \
 	sofficeapp \
@@ -854,7 +854,7 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
 	filter_xslt \
 ))
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11), TRUE)
 $(eval $(call gb_Helper_register_packages_for_install,base_brand,\
 	desktop_sbase_sh \
 ))
@@ -878,7 +878,7 @@ $(eval $(call gb_Helper_register_packages_for_install,math_brand,\
 $(eval $(call gb_Helper_register_packages_for_install,writer_brand,\
 	desktop_swriter_sh \
 ))
-endif # GUIBASE=unx
+endif # USING_X11=TRUE
 
 ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Helper_register_packages_for_install,python, \

RepositoryExternal.mk

@@ -1247,7 +1247,7 @@ endif # ANDROID
 endif # SYSTEM_REDLAND
 
 
-ifneq ($(filter unx,$(GUIBASE))$(ENABLE_CAIRO_CANVAS),) # or
+ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS),) # or
 
 ifneq ($(SYSTEM_CAIRO),)
 
@@ -3308,7 +3308,7 @@ endif # ENABLE_EOT
 
 ### X11 stuff ###
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11), TRUE)
 
 ifeq ($(XRANDR_DLOPEN),FALSE)
 
@@ -3344,7 +3344,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 )
 endef
 
-endif # GUIBASE=unx
+endif # USING_X11
 
 
 gb_ExternalProject__use_nss3:=

config_host.mk.in

@@ -243,7 +243,7 @@ export GTK_CFLAGS=$(gb_SPACE)@GTK_CFLAGS@
 export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@
 export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
 export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
-export GUIBASE=@GUIBASE@
+export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@

configure.ac

@@ -4011,7 +4011,8 @@ AC_SUBST(x_OBJCXXFLAGS)
 AC_SUBST(x_LDFLAGS)
 
 #
-# determine CPUNAME, GUIBASE, ...
+# determine CPUNAME, OS, ...
+# The USING_X11 flag tells whether the host os uses X by default. Can be overriden with the --without-x option.
 #
 SOLARINC=
 
@@ -4020,7 +4021,7 @@ case "$host_os" in
 aix*)
     COM=GCC
     CPUNAME=POWERPC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=AIX
     RTL_OS=AIX
     RTL_ARCH=PowerPC
@@ -4030,7 +4031,7 @@ aix*)
 
 cygwin*)
     COM=MSC
-    GUIBASE=not-used
+    USING_X11=
     OS=WNT
     RTL_OS=Windows
     if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
@@ -4061,7 +4062,7 @@ cygwin*)
 
 darwin*)
     COM=GCC
-    GUIBASE=not-used
+    USING_X11=
     OS=MACOSX
     RTL_OS=MacOSX
     P_SEP=:
@@ -4089,7 +4090,7 @@ darwin*)
 
 dragonfly*)
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=DRAGONFLY
     RTL_OS=DragonFly
     P_SEP=:
@@ -4113,7 +4114,7 @@ dragonfly*)
 
 freebsd*)
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     RTL_OS=FreeBSD
     OS=FREEBSD
     P_SEP=:
@@ -4137,7 +4138,7 @@ freebsd*)
 
 kfreebsd*)
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=LINUX
     RTL_OS=kFreeBSD
     P_SEP=:
@@ -4162,7 +4163,7 @@ kfreebsd*)
 
 linux-gnu*)
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=LINUX
     RTL_OS=Linux
     P_SEP=:
@@ -4279,7 +4280,7 @@ linux-gnu*)
 
 linux-android*)
     COM=GCC
-    GUIBASE=not-used
+    USING_X11=
     OS=ANDROID
     RTL_OS=Android
     P_SEP=:
@@ -4314,7 +4315,7 @@ linux-android*)
 
 mingw*)
     COM=GCC
-    GUIBASE=not-used
+    USING_X11=
     OS=WNT
     RTL_OS=Windows
     P_SEP=:
@@ -4342,7 +4343,7 @@ mingw*)
 *netbsd*)
 
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=NETBSD
     RTL_OS=NetBSD
     P_SEP=:
@@ -4376,7 +4377,7 @@ mingw*)
 
 openbsd*)
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=OPENBSD
     RTL_OS=OpenBSD
     P_SEP=:
@@ -4402,7 +4403,7 @@ openbsd*)
 solaris*)
 
     COM=GCC
-    GUIBASE=unx
+    USING_X11=TRUE
     OS=SOLARIS
     RTL_OS=Solaris
     P_SEP=:
@@ -4436,10 +4437,10 @@ solaris*)
 esac
 
 if test "$with_x" = "no"; then
-    if test "$GUIBASE" != "unx"; then
+    if test "$USING_X11" != TRUE; then
         AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice with --without-x])
     fi
-    GUIBASE=not-used
+    USING_X11=
 fi
 
 WORKDIR="${BUILDDIR}/workdir"
@@ -4451,7 +4452,7 @@ AC_SUBST(CPUNAME)
 AC_SUBST(RTL_OS)
 AC_SUBST(RTL_ARCH)
 AC_SUBST(EPM_FLAGS)
-AC_SUBST(GUIBASE)
+AC_SUBST(USING_X11)
 AC_SUBST([INSTDIR])
 AC_SUBST([INSTROOT])
 AC_SUBST(OS)
@@ -4526,7 +4527,7 @@ if test "$cross_compiling" = "yes"; then
     cp configure CONF-FOR-BUILD
     test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
     (
-    unset COM GUIBASE OS CPUNAME
+    unset COM USING_X11 OS CPUNAME
     unset CC CXX SYSBASE CFLAGS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP
     unset CPPUNIT_CFLAGS CPPUNIT_LIBS
@@ -9949,7 +9950,7 @@ dnl Test which vclplugs have to be built.
 dnl ===================================================================
 R=""
 AC_MSG_CHECKING([which VCLplugs shall be built])
-if test "$GUIBASE" != "unx" -o "$with_x" = "no"; then
+if test "$USING_X11" != TRUE -o "$with_x" = "no"; then
     enable_gtk=no
     enable_gtk3=no
 fi
@@ -11768,7 +11769,7 @@ dnl ===================================================================
 dnl Test whether to build cairo or rely on the system version
 dnl ===================================================================
 
-if test "$GUIBASE" = "unx"; then
+if test "$USING_X11" = TRUE; then
     # Used in vcl/Library_vclplug_gen.mk
     test_cairo=yes
 fi

desktop/Library_sofficeapp.mk

@@ -128,7 +128,7 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 		desktop/source/lib/lokandroid) \
 ))
 else
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 	desktop/source/lib/init \
 	desktop/source/lib/lokinteractionhandler \

postprocess/CustomTarget_registry.mk

@@ -303,7 +303,7 @@ postprocess_FILES_main += \
 	$(postprocess_MOD)/org/openoffice/Office/Paths-macosx.xcu
 		# Inet-macosx.xcu must come after Inet.xcu
 postprocess_DRIVERS += macab
-else ifeq (unx,$(GUIBASE))
+else ifeq ($(USING_X11), TRUE)
 postprocess_FILES_main += \
 	$(postprocess_MOD)/org/openoffice/Inet-unixdesktop.xcu \
 	$(postprocess_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
@@ -431,7 +431,7 @@ postprocess_FILES_postgresql := $(call gb_XcuModuleTarget_get_target,connectivit
 postprocess_DRIVERS += postgresql
 endif
 
-ifeq (unx,$(GUIBASE))
+ifeq ($(USING_X11), TRUE)
 ifneq (,$(or $(filter TRUETRUE,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO))))
 postprocess_XCDS += gnome.xcd
 postprocess_DEPS_gnome := main
@@ -446,7 +446,7 @@ postprocess_FILES_gnome += \
 	$(postprocess_MOD)/org/openoffice/ucb/Configuration-gio.xcu
 endif
 endif
-endif # unx == $(GUIBASE)
+endif # $(USING_X11) == TRUE
 
 ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
 postprocess_XCDS += onlineupdate.xcd

scp2/InstallModule_ooo.mk

@@ -51,7 +51,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	$(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \
 ))
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DGUIBASE_UNX \
 ))

solenv/gbuild/CppunitTest.mk

@@ -172,7 +172,7 @@ endef
 define gb_CppunitTest__use_vcl
 $(call gb_CppunitTest_get_target,$(1)) : VCL := $(true)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstrapprotector)
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11),TRUE)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector)
 $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \
     $(call gb_Library_get_target,vclplug_gen) \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -20,7 +20,7 @@ MERGE_LIBRARY_LIST := \
 	deployment \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-	$(if $(filter unx,$(GUIBASE)),desktop_detector) \
+	$(if $(USING_X11),desktop_detector) \
 	drawinglayer \
 	editeng \
 	filterconfig \

vcl/Library_vcl.mk

@@ -406,7 +406,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 ))
 
 # handle X11 platforms, which have additional files and possibly system graphite
-ifneq (,$(or $(filter unx,$(GUIBASE)),$(ENABLE_HEADLESS)))
+ifneq (,$(or $(USING_X11),$(ENABLE_HEADLESS)))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/generic/glyphs/graphite_serverfont \
 ))
@@ -428,8 +428,6 @@ vcl_coretext_code= \
     vcl/quartz/ctlayout \
     vcl/quartz/salgdi \
 
-# GUIBASE specific stuff
-
 ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Library_add_cxxflags,vcl,\
@@ -567,7 +565,7 @@ vcl_headless_freetype_code=\
     vcl/headless/svptext \
     vcl/headless/svptextrender \
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
 	$(vcl_generic_code) \
     vcl/unx/generic/plugadapt/salplug \

vcl/Module_vcl.mk

@@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_l10n_targets,vcl,\
     UIConfig_vcl \
 ))
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_gen \
     Library_desktop_detector \
@@ -105,7 +105,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
 ))
 
 
-ifeq ($(GUIBASE),unx)
+ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_check_targets,vcl,\
 	CppunitTest_vcl_timer \
 ))