diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 14:29:14 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 19:59:54 +0000 |
| commit | 5b7dff553cf51ecc3d21a2231861390d16ccf0eb (patch) | |
| tree | be8a23e9277d0d8d6e566306754f4a0717201eec | |
| parent | aa05e128de6a8dd0382d0c324676c728dc347ac0 (diff) | |
ENABLE_MACOSX_SANDBOX Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: Ice05796a9887c4ff311b78fcddd9820e0f06e7f1
Reviewed-on: https://gerrit.libreoffice.org/5708
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | apple_remote/Module_apple_remote.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 2 | ||||
| -rw-r--r-- | smoketest/Module_smoketest.mk | 2 | ||||
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk index 5313df39ae4b..d534ad2b13fb 100644 --- a/apple_remote/Module_apple_remote.mk +++ b/apple_remote/Module_apple_remote.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,apple_remote)) ifeq ($(OS),MACOSX) -ifneq ($(ENABLE_MACOSX_SANDBOX),YES) +ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_Module_add_targets,apple_remote,\ Library_AppleRemote \ )) diff --git a/configure.ac b/configure.ac index d82828866e53..f613f9f64203 100644 --- a/configure.ac +++ b/configure.ac @@ -2781,7 +2781,7 @@ if test $_os = Darwin; then elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java]) elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then - ENABLE_MACOSX_SANDBOX=YES + ENABLE_MACOSX_SANDBOX=TRUE AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX) AC_MSG_RESULT([yes]) else @@ -2853,7 +2853,7 @@ fi AC_MSG_CHECKING([whether to treat the installation as read-only]) -if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = YES \) -o \ +if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = TRUE \) -o \ "$enable_extensions" != yes; then enable_readonly_installset=yes fi diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 3ab4ce54cea5..1bc9dae2952b 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ $(eval $(call gb_CppunitTest_use_ure,smoketest)) -ifeq ($(ENABLE_MACOSX_SANDBOX),YES) +ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE) userinstallation=$(shell $(gb_DEVINSTALLROOT)/MacOS/soffice --nstemporarydirectory) else userinstallation=$(WORKDIR)/CustomTarget/smoketest diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 52962a2b8eae..ab06c82a6067 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_check_targets,smoketest,\ )) endif -ifneq (MACOSX/YES,$(OS)/$(ENABLE_MACOSX_SANDBOX)) +ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\ CppunitTest_smoketest \ )) diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index cbe9fa00f356..e00b1b507760 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -68,7 +68,7 @@ done # # At this stage we also attach the entitlements in the sandboxing case -if test $ENABLE_MACOSX_SANDBOX = YES; then +if test $ENABLE_MACOSX_SANDBOX = TRUE; then entitlements="--entitlements $BUILDDIR/lo.xcent" fi diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e37ec15f93db..f82fd875459a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -450,7 +450,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ CoreFoundation \ )) -ifneq ($(ENABLE_MACOSX_SANDBOX),YES) +ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) |