RepositoryExternal.mk | 2 +- configure.ac | 20 ++++++++++---------- postprocess/CustomTarget_registry.mk | 4 ++-- shell/Library_gconfbe.mk | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit 4ef149ba72c0a4b4f38905106a1acb8d21b023be Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 23:20:24 2013 -0500 misc unnecessary FALSE: Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I96cadd25f1c26fd620701a377ca20702ea969460 diff --git a/configure.ac b/configure.ac index e61ef1e..820b6ab 100644 --- a/configure.ac +++ b/configure.ac @@ -8756,7 +8756,7 @@ if test "$with_system_npapi_headers" = "yes"; then else AC_MSG_RESULT([internal]) dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or - dnl ENABLE_NPAPI_INTO_BROWSER is YES + dnl ENABLE_NPAPI_INTO_BROWSER is TRUE SYSTEM_NPAPI_HEADERS=NO fi AC_SUBST(NPAPI_HEADERS_CFLAGS) @@ -10487,7 +10487,7 @@ if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then fi else AC_MSG_RESULT([no]) - ENABLE_REPORTBUILDER=FALSE + ENABLE_REPORTBUILDER= SYSTEM_JFREEREPORT=NO fi AC_SUBST(ENABLE_REPORTBUILDER) @@ -11463,10 +11463,10 @@ dnl =================================================================== AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)]) if test "$enable_silent_msi" = "" -o "$enable_silent_msi" = "no"; then AC_MSG_RESULT([no]) - ENABLE_SILENT_MSI="FALSE" + ENABLE_SILENT_MSI= else AC_MSG_RESULT([yes]) - ENABLE_SILENT_MSI="TRUE" + ENABLE_SILENT_MSI=TRUE SCPDEFS="$SCPDEFS -DENABLE_SILENT_MSI" fi AC_SUBST(ENABLE_SILENT_MSI) @@ -12370,7 +12370,7 @@ if test "$enable_mpl_subset" = "yes"; then warn_report=false if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then warn_report=true - elif test "x$ENABLE_REPORTBUILDER" = "xTRUE"; then + elif test "$ENABLE_REPORTBUILDER" = "TRUE"; then warn_report=true fi if test "$warn_report" = "true"; then commit 81510ee8a59636d9cbc2c3172361685e3573b415 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 23:12:19 2013 -0500 ENABLE_LOCKDOWN Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I47b2d7a59bbf1f5a96523d451c8b6f4fa12c8e90 diff --git a/configure.ac b/configure.ac index abbc940..e61ef1e 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 8b9dd00..cab1be8 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 f034589..78e184e 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 \ )) commit 7c88b25b9eac22f5f926df22e0fa359276090c0b Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 23:05:04 2013 -0500 ENABLE_PACKAGEKIT Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I966f70b17ce9be2c0db015db88dd09ed01dd6387 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e96e812..0217196 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1812,7 +1812,7 @@ $(call gb_LinkTarget_add_defs,$(1),\ -DENABLE_DBUS \ ) -ifeq ($(ENABLE_PACKAGEKIT),YES) +ifeq ($(ENABLE_PACKAGEKIT),TRUE) $(call gb_LinkTarget_add_defs,$(1),\ -DENABLE_PACKAGEKIT \ ) diff --git a/configure.ac b/configure.ac index cada74d..abbc940 100644 --- a/configure.ac +++ b/configure.ac @@ -9873,10 +9873,10 @@ AC_SUBST(DBUS_LIBS) AC_MSG_CHECKING([whether to enable font install via packagekit]) if test "$ENABLE_DBUS" = "TRUE"; then if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then - ENABLE_PACKAGEKIT=YES + ENABLE_PACKAGEKIT=TRUE AC_MSG_RESULT([yes]) else - ENABLE_PACKAGEKIT=NO + ENABLE_PACKAGEKIT= AC_MSG_RESULT([no]) fi else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits