From 666173b83c55cc400f296f66b559ae2723f23795 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 15 Aug 2012 20:24:59 +0200
Subject: [PATCH] add hsqldb to RepositoryExternal.mk

Change-Id: I9c038e6fd1c60e4ac77740c55a45439d813524e0
---
 RepositoryExternal.mk           | 14 ++++++++++++++
 connectivity/Jar_sdbc_hsqldb.mk | 10 ++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39b7b73e0fc4..fad76286343b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1968,6 +1968,20 @@ endif # DESKTOP
 
 ### Jars ############################################################
 
+ifeq ($(SYSTEM_HSQLDB),YES)
+
+define gb_Jar__use_hsqldb
+$(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR))
+endef
+
+else # !SYSTEM_HSQLDB
+
+define gb_Jar__use_hsqldb
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/hsqldb.jar)
+endef
+
+endif # SYSTEM_HSQLDB
+
 ifeq ($(SYSTEM_SAXON),YES)
 
 define gb_Jar__use_saxon
diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 3f330e24e6ae..73bdb029a6c2 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -27,15 +27,9 @@
 
 $(eval $(call gb_Jar_Jar,sdbc_hsqldb))
 
-ifeq ($(SYSTEM_HSQLDB),YES)
-$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
-	$(HSQLDB_JAR) \
+$(eval $(call gb_Jar_use_externals,sdbc_hsqldb,\
+	hsqldb \
 ))
-else
-$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
-	$(OUTDIR)/bin/hsqldb.jar \
-))
-endif
 
 # FIXME: is this really necessary?
 $(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\