diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-18 14:12:08 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-25 07:25:46 +0000 |
| commit | c29ea22b899f24dab3eecce9df8c70544f044e1b (patch) | |
| tree | 83c000b95f9863a938facc96b75d7e65e7e2b127 /RepositoryExternal.mk | |
| parent | edb9ef41f29bf3477b8985ee409ce2d22214e63f (diff) | |
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/18688
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 781c800e7d1f..b55aa13e9d46 100644 --- a/RepositoryExternal.mk +++ b/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:= |