Kaydet (Commit) 81510ee8 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

ENABLE_LOCKDOWN Harmonize ENABLE_* variable to TRUE/<nothing>

Change-Id: I47b2d7a59bbf1f5a96523d451c8b6f4fa12c8e90
üst 7c88b25b
......@@ -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])
......
......@@ -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 \
......
......@@ -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 \
))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment