--- db-4.7.25/dist/Makefile.in
+++ db-4.7.25/dist/Makefile.in
@@ -14,8 +14,8 @@ libdir=	@libdir@
 docdir=	$(prefix)/docs
 
 dmode=	755
-emode=	555
-fmode=	444
+emode=	755
+fmode=	644
 
 transform=@program_transform_name@
 
@@ -59,6 +59,7 @@ LDFLAGS=	@LDFLAGS@
 LIBS=		@LIBSO_LIBS@
 TEST_LIBS=	@TEST_LIBS@
 LIBCSO_LIBS=	@LIBCSO_LIBS@ @LIBSO_LIBS@
+LIBCSO_FLAGS=	-Wl,--version-script=$(srcdir)/dist/libdb.map
 
 libdb_base=	libdb
 libdb=		$(libdb_base).a
@@ -68,6 +69,12 @@ libso_target=	$(libdb_base)-$(LIBVERSION).la
 libso_default=	$(libdb_base)@SOSUFFIX@
 libso_major=	$(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
 
+libint_base=	libdb_int
+libiso=		$(libint_base)-$(LIBVERSION)@SOSUFFIX@
+libiso_target=	$(libint_base)-$(LIBVERSION).la
+libiso_default=	$(libint_base)@SOSUFFIX@
+libiso_major=	$(libint_base)-$(LIBMAJOR)@SOSUFFIX@
+
 ##################################################
 # C++ API.
 #
@@ -92,7 +99,7 @@ libxso_major=	$(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
 #
 # Java support is optional and requires shared librarires.
 ##################################################
-CLASSPATH=	$(JAVA_CLASSTOP)
+CLASSPATH=	$(JAVA_CLASSTOP):$(JAVA_SRCDIR)
 LIBJSO_LIBS=	@LIBJSO_LIBS@ @LIBSO_LIBS@
 SWIGCFLAGS=	@SWIGCFLAGS@
 
@@ -121,7 +128,7 @@ libjso_g=	$(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
 # Tcl support is optional and requires shared libraries.
 ##################################################
 TCL_INCLUDE_SPEC=	@TCL_INCLUDE_SPEC@
-LIBTSO_LIBS=	@LIBTSO_LIBS@ @LIBSO_LIBS@
+LIBTSO_LIBS=	@LIBTSO_LIBS@ @LIBSO_LIBS@ -ltcl
 libtso_base=	libdb_tcl
 libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
 libtso_static=	$(libtso_base)-$(LIBVERSION).a
@@ -689,6 +696,10 @@ LIB_INSTALL_FILE_LIST=\
 	$(libso_major) \
 	$(libdb_version) \
 	$(libso_target) \
+	$(libiso) \
+	$(libiso_default) \
+	$(libiso_major) \
+	$(libiso_target) \
 	$(libcxx) \
 	$(libxso) \
 	$(libxso_default) \
@@ -722,47 +733,47 @@ install: all @INSTALL_TARGET@
 library_build: @INSTALL_LIBS@ @ADDITIONAL_LANG@ $(UTIL_PROGS)
 
 # Static C library named libdb.a.
-$(libdb): $(DEF_LIB)
+$(libdb): $(libdb_version)
+	$(RM) -f $(libdb)
+	$(LN) -s $(libdb_version) $(libdb)
 
 # Real static C library.
 $(libdb_version): $(C_OBJS)
 	$(AR) cr $@ $(C_OBJS)
 	$(RANLIB) $@
-	$(RM) -f $(libdb)
-	$(LN) -s $(libdb_version) $(libdb)
 
 # Shared C library.
 $(libso_target): $(C_OBJS)
+	$(SOLINK) $(SOFLAGS) $(LIBCSO_FLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
+
+# Shared C library with internal API exported.
+$(libiso_target): $(C_OBJS)
 	$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
-	$(RM) -f $(libdb)
-	$(LN) -s .libs/$(libdb_version) $(libdb)
 
 # Static C++ library named libdb_cxx.a.
-$(libcxx): $(DEF_LIB_CXX)
+$(libcxx): $(libcxx_version)
+	$(RM) -f $(libcxx)
+	$(LN) -s $(libcxx_version) $(libcxx)
 
 # Real static C++ library.
 $(libcxx_version): $(CXX_OBJS) $(C_OBJS)
 	$(AR) cr $@ $(CXX_OBJS) $(C_OBJS)
 	$(RANLIB) $@
-	$(RM) -f $(libcxx)
-	$(LN) -s $(libcxx_version) $(libcxx)
 
 # Shared C++ library.
-$(libxso_target): $(CXX_OBJS) $(C_OBJS)
+$(libxso_target): $(CXX_OBJS) $(DEF_LIB)
 	$(XSOLINK) $(SOFLAGS) $(LDFLAGS) \
-	    -o $@ $(CXX_OBJS) $(C_OBJS) $(LIBXSO_LIBS)
-	$(RM) -f $(libcxx)
-	$(LN) -s .libs/$(libcxx_version) $(libcxx)
+	    -o $@ $(CXX_OBJS) $(DEF_LIB) $(LIBXSO_LIBS)
 
 # Shared Java library.
-$(libjso_target): $(JAVA_OBJS) $(C_OBJS)
+$(libjso_target): $(JAVA_OBJS) $(DEF_LIB)
 	$(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \
-	    -o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
+	    -o $@ $(JAVA_OBJS) $(DEF_LIB) $(LIBJSO_LIBS)
 
 # Shared Tcl library.
-$(libtso_target): $(TCL_OBJS) $(C_OBJS)
+$(libtso_target): $(TCL_OBJS) $(DEF_LIB)
 	$(SOLINK) @LIBTSO_MODULE@ $(SOFLAGS) $(LDFLAGS) \
-	    -o $@ $(TCL_OBJS) $(C_OBJS) $(LIBTSO_LIBS)
+	    -o $@ $(TCL_OBJS) $(DEF_LIB) $(LIBTSO_LIBS)
 
 ##################################################
 # Creating individual dependencies and actions for building class
@@ -898,6 +909,8 @@ install_lib:
 	@(cd $(DESTDIR)$(libdir) && \
 	    test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
 	    test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
+	    test -f $(libiso) && $(LN) -s $(libiso) $(libiso_default); \
+	    test -f $(libiso) && $(LN) -s $(libiso) $(libiso_major); \
 	    test -f $(libxso) && $(LN) -s $(libxso) $(libxso_default); \
 	    test -f $(libxso) && $(LN) -s $(libxso) $(libxso_major); \
 	    test -f $(libtso) && $(LN) -s $(libtso) $(libtso_default); \
--- db-4.7.25/dist/configure
+++ db-4.7.25/dist/configure
@@ -21195,7 +21195,7 @@ if test "$enable_shared" = "no"; then
 	POSTLINK=": "
 	o=".o"
 else
-	DEFAULT_LIB="\$(libso_target)"
+	DEFAULT_LIB="\$(libiso_target)"
 	POSTLINK="\$(LIBTOOL) --mode=execute true"
 	o=".lo"
 fi
@@ -21203,6 +21203,9 @@ INSTALL_LIBS="$DEFAULT_LIB"
 if test "$enable_static" = "yes"; then
 	INSTALL_LIBS="$INSTALL_LIBS \$(libdb)"
 fi
+if test "$enable_shared" = "yes"; then
+	INSTALL_LIBS="$INSTALL_LIBS \$(libso_target)"
+fi
 
 # Optional C++ API.
 if test "$db_cv_cxx" = "yes"; then
@@ -21965,7 +21968,9 @@ echo "$as_me: error: Java version 1.3 or higher required, got $JAVA_VERSION" >&2
 
 	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
 	do
-		CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+		if test "$JNI_INCLUDE_DIR" != "/usr/include" -a "$JNI_INCLUDE_DIR" != "/usr/include/linux"; then
+			CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+		fi
 	done
 
 	ADDITIONAL_LANG="$ADDITIONAL_LANG java"
--- db-4.7.25/dist/configure.ac
+++ db-4.7.25/dist/configure.ac
@@ -378,7 +378,7 @@ if test "$enable_shared" = "no"; then
 	POSTLINK=": "
 	o=".o"
 else
-	DEFAULT_LIB="\$(libso_target)"
+	DEFAULT_LIB="\$(libiso_target)"
 	POSTLINK="\$(LIBTOOL) --mode=execute true"
 	o=".lo"
 fi
@@ -386,6 +386,9 @@ INSTALL_LIBS="$DEFAULT_LIB"
 if test "$enable_static" = "yes"; then
 	INSTALL_LIBS="$INSTALL_LIBS \$(libdb)"
 fi
+if test "$enable_shared" = "yes"; then
+	INSTALL_LIBS="$INSTALL_LIBS \$(libso_target)"
+fi
 
 # Optional C++ API.
 if test "$db_cv_cxx" = "yes"; then
@@ -445,7 +448,9 @@ if test "$db_cv_java" = "yes"; then
 
 	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
 	do
-		CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+		if test "$JNI_INCLUDE_DIR" != "/usr/include" -a "$JNI_INCLUDE_DIR" != "/usr/include/linux"; then
+			CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+		fi
 	done
 
 	ADDITIONAL_LANG="$ADDITIONAL_LANG java"
--- /dev/null
+++ db-4.7.25/dist/libdb.map
@@ -0,0 +1,57 @@
+{
+  global:
+    __db185_open;
+    __db_assert;
+    __db_dbm_close;
+    __db_dbm_delete;
+    __db_dbm_fetch;
+    __db_dbm_firstkey;
+    __db_dbm_init;
+    __db_dbm_nextkey;
+    __db_dbm_store;
+    __db_hcreate;
+    __db_hdestroy;
+    __db_hsearch;
+    __db_ndbm_clearerr;
+    __db_ndbm_close;
+    __db_ndbm_delete;
+    __db_ndbm_dirfno;
+    __db_ndbm_error;
+    __db_ndbm_fetch;
+    __db_ndbm_firstkey;
+    __db_ndbm_nextkey;
+    __db_ndbm_open;
+    __db_ndbm_pagfno;
+    __db_ndbm_rdonly;
+    __db_ndbm_store;
+    db_create;
+    db_env_create;
+    db_env_set_func_close;
+    db_env_set_func_dirfree;
+    db_env_set_func_dirlist;
+    db_env_set_func_exists;
+    db_env_set_func_free;
+    db_env_set_func_fsync;
+    db_env_set_func_ftruncate;
+    db_env_set_func_ioinfo;
+    db_env_set_func_malloc;
+    db_env_set_func_map;
+    db_env_set_func_open;
+    db_env_set_func_pread;
+    db_env_set_func_pwrite;
+    db_env_set_func_read;
+    db_env_set_func_realloc;
+    db_env_set_func_rename;
+    db_env_set_func_seek;
+    db_env_set_func_sleep;
+    db_env_set_func_unlink;
+    db_env_set_func_unmap;
+    db_env_set_func_write;
+    db_env_set_func_yield;
+    db_sequence_create;
+    db_strerror;
+    db_version;
+    log_compare;
+  local:
+    *;
+};