diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_extensions.mk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a5fa3e910de7..23fce0616226 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -917,7 +917,7 @@ endef ifeq ($(ENABLE_LIBLANGTAG),TRUE) -ifeq ($(SYSTEM_LIBLANGTAG),YES) +ifneq ($(SYSTEM_LIBLANGTAG),) define gb_LinkTarget__use_liblangtag $(call gb_LinkTarget_set_include,$(1),\ @@ -2945,7 +2945,7 @@ endef endif # SYSTEM_BSH -ifeq ($(SYSTEM_RHINO),YES) +ifneq ($(SYSTEM_RHINO),) define gb_Jar__use_rhino $(call gb_Jar_use_system_jar,$(1),$(RHINO_JAR)) diff --git a/configure.ac b/configure.ac index 50094222dfd8..e21d49ea65b2 100644 --- a/configure.ac +++ b/configure.ac @@ -10876,7 +10876,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then AC_MSG_CHECKING([which rhino to use]) if test "$with_system_rhino" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_RHINO=YES + SYSTEM_RHINO=TRUE if test -z $RHINO_JAR; then RHINO_JAR=/usr/share/java/js.jar fi @@ -10884,7 +10884,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then [AC_MSG_ERROR(js.jar not found.)], []) else AC_MSG_RESULT([internal]) - SYSTEM_RHINO=NO + SYSTEM_RHINO= BUILD_TYPE="$BUILD_TYPE RHINO" fi else @@ -11870,13 +11870,13 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != AC_MSG_RESULT([yes]) AC_MSG_CHECKING([whether to use system liblangtag]) if test "$with_system_liblangtag" = yes; then - SYSTEM_LIBLANGTAG=YES + SYSTEM_LIBLANGTAG=TRUE AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0) LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") libo_MINGW_CHECK_DLL([liblangtag]) else - SYSTEM_LIBLANGTAG=NO + SYSTEM_LIBLANGTAG= AC_MSG_RESULT([no]) BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" if test "$COM" = "MSC"; then diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index b50653c55251..849d94bebec8 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ )) $(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DENABLE_LIBLANGTAG)) -ifeq ($(SYSTEM_LIBLANGTAG),YES) +ifneq ($(SYSTEM_LIBLANGTAG),) $(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DSYSTEM_LIBLANGTAG)) else $(eval $(call gb_CppunitTest_use_package,i18nlangtag_test_languagetag,liblangtag_data)) diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk index 3e7f41011a1a..7250d12dd9af 100644 --- a/scp2/InstallModule_extensions.mk +++ b/scp2/InstallModule_extensions.mk @@ -18,7 +18,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/extensions,\ $(if $(SYSTEM_BSH),\ -DBSH_JAR=\""$(call gb_Helper_make_url,$(BSH_JAR))"\" \ ) \ - $(if $(filter YES,$(SYSTEM_RHINO)),\ + $(if $(SYSTEM_RHINO),\ -DRHINO_JAR=\""$(call gb_Helper_make_url,$(RHINO_JAR))"\" \ ) \ )) |