remove last uses of config 'GUI' variable

Change-Id: I97188235f0b72b5b54423e05deeaf17c5c681048
Reviewed-on: https://gerrit.libreoffice.org/4188
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

8 files changed, 11 insertions, 36 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 93632636cc65..a3ecf99b1f8b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -207,7 +207,6 @@ 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 GUI=@GUI@
 export GUIBASE=@GUIBASE@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
 export HAVE_CXX11=@HAVE_CXX11@
diff --git a/configure.ac b/configure.ac
index 51a534f57f96..4d744ec09898 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3455,7 +3455,7 @@ AC_SUBST(x_OBJCXXFLAGS)
 AC_SUBST(x_LDFLAGS)
 
 #
-# determine CPU, CPUNAME, GUI, GUIBASE, ...
+# determine CPU, CPUNAME, GUIBASE, ...
 #
 LIB64="lib"
 SOLARINC=
@@ -3466,7 +3466,6 @@ aix*)
     COM=GCC
     CPU=P
     CPUNAME=POWERPC
-    GUI=UNX
     GUIBASE=unx
     OS=AIX
     RTL_OS=AIX
@@ -3479,7 +3478,6 @@ aix*)
 
 cygwin*)
     COM=MSC
-    GUI=WNT
     GUIBASE=not-used
     OS=WNT
     RTL_OS=Windows
@@ -3513,7 +3511,6 @@ cygwin*)
 
 darwin*)
     COM=GCC
-    GUI=UNX
     GUIBASE=not-used
     OS=MACOSX
     RTL_OS=MacOSX
@@ -3563,7 +3560,6 @@ darwin*)
 
 dragonfly*)
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     OS=DRAGONFLY
     RTL_OS=DragonFly
@@ -3592,7 +3588,6 @@ dragonfly*)
 
 freebsd*)
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     RTL_OS=FreeBSD
     OS=FREEBSD
@@ -3622,7 +3617,6 @@ freebsd*)
 
 kfreebsd*)
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     OS=LINUX
     RTL_OS=kFreeBSD
@@ -3654,7 +3648,6 @@ kfreebsd*)
 
 linux-gnu*)
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     OS=LINUX
     RTL_OS=Linux
@@ -3798,7 +3791,6 @@ linux-gnu*)
 
 linux-android*)
     COM=GCC
-    GUI=UNX
     GUIBASE=not-used
     OS=ANDROID
     RTL_OS=Android
@@ -3836,7 +3828,6 @@ linux-android*)
 
 mingw*)
     COM=GCC
-    GUI=WNT
     GUIBASE=not-used
     OS=WNT
     RTL_OS=Windows
@@ -3871,7 +3862,6 @@ mingw*)
 *netbsd*)
 
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     OS=NETBSD
     RTL_OS=NetBSD
@@ -3912,7 +3902,6 @@ mingw*)
 
 openbsd*)
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     OS=OPENBSD
     RTL_OS=OpenBSD
@@ -3945,7 +3934,6 @@ openbsd*)
 solaris*)
 
     COM=GCC
-    GUI=UNX
     GUIBASE=unx
     OS=SOLARIS
     RTL_OS=Solaris
@@ -4011,7 +3999,6 @@ AC_SUBST(CPUNAME)
 AC_SUBST(RTL_OS)
 AC_SUBST(RTL_ARCH)
 AC_SUBST(EPM_FLAGS)
-AC_SUBST(GUI)
 AC_SUBST(GUIBASE)
 AC_SUBST(INPATH)
 AC_SUBST([INSTDIR])
@@ -4127,7 +4114,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
     (
-    unset COM GUI GUIBASE OS CPU CPUNAME
+    unset COM GUIBASE OS CPU CPUNAME
     unset CC CXX SYSBASE CFLAGS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
     unset CPPUNIT_CFLAGS CPPUNIT_LIBS
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 90d4880f2f6b..74bdb8ae24fa 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -45,9 +45,7 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\
 ))
 endif
 
-endif # GUI=UNX
-
-ifeq ($(OS),WNT)
+else ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 	ooopathutils \
@@ -95,7 +93,7 @@ endif
 
 $(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin))
 
-endif # GUI=WNT
+endif
 
 $(eval $(call gb_Library_add_exception_objects,npsoplugin,\
 	extensions/source/nsplugin/source/npshell \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 3970fdf80719..102217a50fe2 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -55,11 +55,8 @@ $(eval $(call gb_Library_add_exception_objects,pl,\
 	extensions/source/plugin/win/winmgr \
 	extensions/source/plugin/win/sysplug \
 ))
-endif # GUI=WNT
 
-ifneq ($(OS),WNT)
-
-ifeq ($(OS),MACOSX)
+else ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Library_add_objcxxobjects,pl,\
 	extensions/source/plugin/aqua/macmgr \
@@ -72,7 +69,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,pl,\
     CoreFoundation \
 ))
 
-else # OS!=MACOSX
+else
 
 ifeq ($(ENABLE_GTK),TRUE)
 $(eval $(call gb_Library_add_defs,pl,\
@@ -96,9 +93,7 @@ $(eval $(call gb_Library_add_libs,pl,\
 	-lX11 \
 ))
 
-endif # OS=MACOSX
-
-endif # GUI=UNX
+endif
 
 $(eval $(call gb_Library_use_libraries,pl,\
 	tk \
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 1abcfbac6d3c..5795217fcd3b 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -46,12 +46,11 @@ HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_input
     resEmbStylesheet(in_resEmbStylesheet), bExtensionMode( in_bExtensionMode )
 {
     xmlKeepBlanksDefaultValue = 0;
-    char* guitmp = getenv("GUI");
-    if (guitmp)
+    char* os = getenv("OS");
+    if (os)
     {
-        gui = (strcmp(guitmp, "UNX") ? gui : "UNIX");
-        gui = (strcmp(guitmp, "MAC") ? gui : "MAC");
-        gui = (strcmp(guitmp, "WNT") ? gui : "WIN");
+        gui = (strcmp(os, "WNT") ? "UNIX" : "WIN");
+        gui = (strcmp(os, "MACOSX") ? gui : "MAC");
     }
 }
 
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 047f36cc6308..13b731ef340f 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -58,7 +58,6 @@ $(readlicense_oo_README_PATTERN) : \
 		$(call gb_ExternalExecutable_get_command,xsltproc) --nonet --novalid -o $@.out \
 			--stringparam com1 $(COM) \
 			--stringparam cp1 $(CPUNAME) \
-			--stringparam gui1 $(GUI) \
 			--stringparam lang1 $(word 2,$(subst _, ,$(basename $(notdir $@)))) \
 			--stringparam os1 $(OS) \
 			--stringparam type text \
diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl
index e63e319cf502..5c329430f3c3 100755
--- a/readlicense_oo/docs/readme.xsl
+++ b/readlicense_oo/docs/readme.xsl
@@ -6,7 +6,6 @@
   	
   <!-- inputvariable declaration -->
 	<xsl:param name="os1"/>
-	<xsl:param name="gui1"/>
 	<xsl:param name="cp1"/>
 	<xsl:param name="com1"/>
 	<xsl:param name="lang1"/>
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 573d1bb68a09..c1894bd0e69e 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -266,7 +266,6 @@ sub check_system_environment
 
     my @environmentvariables = qw(
         SOLARVERSION
-        GUI
         WORK_STAMP
         OUTPATH
         LOCAL_OUT