[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/qa

[René Engelhard]

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

New commits:
commit d05d6223b5d21ee1ac02219485d45374e794c814
Author: Rene Engelhard <rene at debian.org>
Date:   Tue May 31 13:20:57 2011 +0200

    fix build in connectivity/qa with system-hsqldb

diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index ee41cab..4dc2ee3 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)