diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 23:12:19 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 23:12:19 -0500 |
| commit | 81510ee8a59636d9cbc2c3172361685e3573b415 (patch) | |
| tree | fa473939ab9c990556c2e9d62360abd20d1c5449 | |
| parent | 7c88b25b9eac22f5f926df22e0fa359276090c0b (diff) | |
ENABLE_LOCKDOWN Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I47b2d7a59bbf1f5a96523d451c8b6f4fa12c8e90
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 | ||||
| -rw-r--r-- | shell/Library_gconfbe.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index abbc94076ac6..e61ef1e49955 100644 --- a/configure.ac +++ b/configure.ac @@ -9812,7 +9812,7 @@ dnl =================================================================== dnl GCONF check dnl =================================================================== -ENABLE_GCONF="" +ENABLE_GCONF= AC_MSG_CHECKING([whether to enable GConf support]) if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "iOS" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" @@ -11104,9 +11104,9 @@ dnl =================================================================== dnl Test for the enabling the lockdown pieces dnl =================================================================== AC_MSG_CHECKING([whether to enable the lockdown pieces]) -ENABLE_LOCKDOWN="" +ENABLE_LOCKDOWN= if test -n "$enable_lockdown" -a "$enable_lockdown" != "no"; then - ENABLE_LOCKDOWN=YES + ENABLE_LOCKDOWN=TRUE AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 8b9dd008a43f..cab1be8417eb 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -434,10 +434,10 @@ postprocess_DRIVERS += postgresql endif ifeq (unx,$(GUIBASE)) -ifneq (,$(or $(filter TRUEYES,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO)))) +ifneq (,$(or $(filter TRUETRUE,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO)))) postprocess_XCDS += gnome.xcd postprocess_DEPS_gnome := main -ifeq ($(ENABLE_GCONF)$(ENABLE_LOCKDOWN),TRUEYES) +ifeq ($(ENABLE_GCONF)$(ENABLE_LOCKDOWN),TRUETRUE) postprocess_FILES_gnome += \ $(postprocess_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \ $(postprocess_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index f034589d5349..78e184eec88d 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,gconfbe1)) -ifeq ($(ENABLE_LOCKDOWN),YES) +ifeq ($(ENABLE_LOCKDOWN),TRUE) $(eval $(call gb_Library_add_defs,gconfbe1,\ -DENABLE_LOCKDOWN \ )) |