--- db-4.1.25/dist/aclocal_java/ac_jni_include_dirs.ac.jni-pkgconfig	2002-09-06 09:32:01.000000000 -0400
+++ db-4.1.25/dist/aclocal_java/ac_jni_include_dirs.ac	2005-08-09 02:15:59.000000000 -0400
@@ -64,8 +64,6 @@ else
 		if test "$_JTOPDIR" != "/usr"; then
 			JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"
 		fi
-	else
-		AC_MSG_ERROR([cannot find java include files])
 	fi
 fi
 
--- db-4.1.25/dist/configure.ac.jni-pkgconfig	2002-09-06 09:32:00.000000000 -0400
+++ db-4.1.25/dist/configure.ac	2005-08-09 00:45:00.000000000 -0400
@@ -333,10 +333,20 @@ if test "$db_cv_java" = "yes"; then
 	AC_PROG_JAR
         AC_JNI_INCLUDE_DIR
 
+	dnl check for libgcj includes
+	if test -z "$PKG_CONFIG"; then
+		AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+	fi
+	if test -z "$JNI_INCLUDE_DIRS"; then
+		if $PKG_CONFIG --exists libgcj ; then
+			CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libgcj`"
+		fi
+	else
 	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
 	do
 		CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
 	done
+	fi
 
 	ADDITIONAL_LANG="$ADDITIONAL_LANG java"
 	INSTALL_LIBS="$INSTALL_LIBS \$(libjso_target)"