From ae0eaa57ba2cef0313f853d19a9a13629bcd07cb Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Tue, 31 May 2011 13:20:57 +0200
Subject: [PATCH] fix build in connectivity/qa with system-hsqldb

---
 connectivity/qa/makefile.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index ee41cab63554..4dc2ee363389 100755
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -35,9 +35,15 @@ PACKAGE = complex/connectivity
 
 #----- compile .java files -----------------------------------------
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
 
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+.ELSE
+JARFILES+= hsqldb.jar
+.ENDIF
+
 #----- make a jar from compiled files ------------------------------
 
 JARCLASSDIRS = $(PACKAGE)