From d2a3af982431d143fb619a6295a81f97642f585f Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 19 Apr 2006 14:02:49 +0000 Subject: [PATCH] INTEGRATION: CWS systemjava (1.6.82); FILE MERGED 2006/03/22 14:07:40 cmc 1.6.82.1: #i52974# support using the system hsqldb --- .../com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk index 02b9fd78dc43..4955ff69d10d 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2005-09-08 04:56:11 $ +# last change: $Author: hr $ $Date: 2006-04-19 15:02:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,12 @@ TARGET = sdbc_hsqldb # --- Files -------------------------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar +.IF "$(SYSTEM_HSQLDB)" == "YES" +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) +.ELSE +JARFILES+= hsqldb.jar +.ENDIF JAVAFILES =\ NativeInputStreamHelper.java\ NativeOutputStreamHelper.java\