summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-25 19:20:06 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-25 23:31:30 +0200
commit30ad101b102e4d69c9d2c55884ab975145d8c1db (patch)
treed6ca4218d2cf0f07c442c4f51d97367faffc2a69 /RepositoryExternal.mk
parent461d830ed8f664e171245b0cf9d53dc33a0f04d2 (diff)
tomcat: use servlet-api.jar from WORKDIR too
Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57e8d6bc2384..b1a650ee2cdb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2786,6 +2786,18 @@ endef
endif # SYSTEM_RHINO
+ifeq ($(SYSTEM_TOMCAT),YES)
+
+gb_ExternalProject__use_servlet_api :=
+
+else # !SYSTEM_TOMCAT
+
+define gb_ExternalProject__use_servlet_api
+$(eval $(call gb_ExternalProject_use_external_project,$(1),tomcat))
+endef
+
+endif # SYSTEM_TOMCAT
+
ifeq ($(SYSTEM_APACHE_COMMONS),YES)
define gb_Jar__use_commons-codec