--- xmlhelp/inc/provider/db.hxx.orig	2004-10-28 15:52:01 +0400
+++ xmlhelp/inc/provider/db.hxx	2004-12-30 09:27:50 +0300
@@ -2,8 +2,12 @@
 #define _DB_HXX_
 
 #ifndef _DB_H_
+#ifdef SYSTEM_DB
+#include <db.h>
+#else
 #include <berkeleydb/db.h>
 #endif
+#endif
 
 
 namespace chelp {
--- berkeleydb/makefile.mk.orig	2004-10-28 15:54:48 +0400
+++ berkeleydb/makefile.mk	2004-12-30 09:58:46 +0300
@@ -76,6 +76,7 @@
 # not needed for win32. comment out when causing problems...
 
 .IF "$(GUI)"=="UNX"
+.IF "$(SYSTEM_DB)" != "YES"
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=..$/dist$/configure
@@ -92,11 +93,31 @@
 BUILD_ACTION=make
 .ENDIF
 
+.ENDIF
+
+.IF "$(SYSTEM_DB)" != "YES"
 OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
 .IF "$(SOLAR_JAVA)"!=""
 OUT2BIN=$(BUILD_DIR)$/db.jar
 OUT2CLASS=$(BUILD_DIR)$/db.jar
 .ENDIF
+.ELSE
+
+DB_LIB = \
+       $/lib$/libdb-$(DB_VERSION).so \
+       $/usr$/lib$/libdb_cxx-$(DB_VERSION).so
+.IF "$(SOLAR_JAVA)" != ""
+       DB_LIB += $/usr$/lib$/libdb_java-$(DB_VERSION).so
+.ENDIF
+
+all: $(DB_JAR) $(DB_INC) $(DB_LIB)
+.IF "$(SOLAR_JAVA)" != ""
+      +$(COPY) $(DB_JAR) $(BIN)/db.jar
+      +$(COPY) $(DB_JAR) $(CLASSDIR)/db.jar
+.ENDIF
+
+.ENDIF
+
 
 .ENDIF			# "$(GUI)"=="UNX"
 
--- solenv/inc/libs.mk.orig	2004-12-30 09:14:58 +0300
+++ solenv/inc/libs.mk	2004-12-30 09:15:16 +0300
@@ -183,7 +183,7 @@
 .ENDIF
 JPEG3RDLIB=-ljpeglib
 NEON3RDLIB=-lneon
-BERKELEYLIB=-ldb-4.2
+BERKELEYLIB=-ldb-$(DB_VERSION)
 CURLLIB=-lcurl
 SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
 SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
--- scp/source/office/files.scp.orig	2004-10-28 15:54:26 +0400
+++ scp/source/office/files.scp	2004-12-30 09:20:02 +0300
@@ -1019,31 +1019,35 @@
 
 #endif
 
+#ifndef SYSTEM_DB
 File GID_FILE_LIB_DB42
         TXT_FILE_BODY;
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
+        Name            = STRING(CONCAT2(libdb-,DB_VERSION,UNXSUFFIX));
         #else
         Name            = "libdb42.dll";
         #endif
 End
+#endif
 
 #ifdef SOLAR_JAVA
+#ifndef SYSTEM_DB
 
 File GID_FILE_LIB_DBJAVA42
         TXT_FILE_BODY;
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
+        Name            = STRING(CONCAT2(libdb_java-,DB_VERSION,UNXSUFFIX));
         #else
         Name            = "libdb_java42.dll";
         #endif
 End
 
 #endif
+#endif
 
 #ifdef UNX