From 7d2f7c6d7eab19fd8d692ed0f162c70103b091f0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 11 Feb 2014 19:39:18 +0100 Subject: normalize values of SYSTEM_APACHE_COMMONS, SYSTEM_BSH Change-Id: Ia6adb8ae07ec80e83bc67084dfbd0bc6136ed8b7 --- RepositoryExternal.mk | 4 ++-- configure.ac | 8 ++++---- external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 +- external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 +- scp2/InstallModule_extensions.mk | 2 +- swext/Extension_wiki-publisher.mk | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2960d840ed8a..a5fa3e910de7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2926,7 +2926,7 @@ endef endif # SYSTEM_HSQLDB -ifeq ($(SYSTEM_BSH),YES) +ifneq ($(SYSTEM_BSH),) define gb_Jar__use_bsh $(call gb_Jar_use_system_jar,$(1),$(BSH_JAR)) @@ -2963,7 +2963,7 @@ endef endif # SYSTEM_RHINO -ifeq ($(SYSTEM_APACHE_COMMONS),YES) +ifneq ($(SYSTEM_APACHE_COMMONS),) define gb_Jar__use_commons-codec $(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR)) diff --git a/configure.ac b/configure.ac index ce2caf2a518a..50094222dfd8 100644 --- a/configure.ac +++ b/configure.ac @@ -10756,7 +10756,7 @@ AC_SUBST(LIBSERIALIZER_JAR) if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then - SYSTEM_APACHE_COMMONS=YES + SYSTEM_APACHE_COMMONS=TRUE AC_MSG_RESULT([external]) if test "$ENABLE_MEDIAWIKI" = "TRUE"; then if test -z $COMMONS_CODEC_JAR; then @@ -10822,7 +10822,7 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then fi else AC_MSG_RESULT([internal]) - SYSTEM_APACHE_COMMONS=NO + SYSTEM_APACHE_COMMONS= BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi @@ -10844,7 +10844,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then AC_MSG_CHECKING([which beanshell to use]) if test "$with_system_beanshell" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_BSH=YES + SYSTEM_BSH=TRUE if test -z $BSH_JAR; then BSH_JAR=/usr/share/java/bsh.jar fi @@ -10852,7 +10852,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then [AC_MSG_ERROR(bsh.jar not found.)], []) else AC_MSG_RESULT([internal]) - SYSTEM_BSH=NO + SYSTEM_BSH= BUILD_TYPE="$BUILD_TYPE BSH" fi else diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index e93cc0b6241b..d2efb32b5f80 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index e6248f0c2688..861d25a276b7 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk index 181d2afd5fdf..3e7f41011a1a 100644 --- a/scp2/InstallModule_extensions.mk +++ b/scp2/InstallModule_extensions.mk @@ -15,7 +15,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\ )) $(eval $(call gb_InstallModule_add_defs,scp2/extensions,\ - $(if $(filter YES,$(SYSTEM_BSH)),\ + $(if $(SYSTEM_BSH),\ -DBSH_JAR=\""$(call gb_Helper_make_url,$(BSH_JAR))"\" \ ) \ $(if $(filter YES,$(SYSTEM_RHINO)),\ diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk index aeaff27c719f..6656442eac0e 100644 --- a/swext/Extension_wiki-publisher.mk +++ b/swext/Extension_wiki-publisher.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml)) $(eval $(call gb_Extension_use_default_description,wiki-publisher,swext/mediawiki/src/description-en-US.txt)) $(eval $(call gb_Extension_use_default_license,wiki-publisher)) -ifneq ($(SYSTEM_APACHE_COMMONS),YES) +ifeq ($(SYSTEM_APACHE_COMMONS),) $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_logging)) $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_codec)) $(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient)) -- cgit