Index: db-3.2.9.patch =================================================================== RCS file: /cvs/oo/external/berkeleydb/db-3.2.9.patch,v retrieving revision 1.5.2.1.2.3 diff -u -r1.5.2.1.2.3 db-3.2.9.patch --- db-3.2.9.patch 28 Mar 2003 15:18:43 -0000 1.5.2.1.2.3 +++ db-3.2.9.patch 13 Apr 2003 06:06:49 -0000 @@ -100,7 +100,7 @@ *) JINCSUBDIRS="genunix";; esac ---- 1786,1823 ---- +--- 1786,1825 ---- echo "$ac_t""$JAVACABS" 1>&6 done JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` @@ -111,7 +111,9 @@ ! darwin*) ! JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'` ! echo "$JFRAMEDIR" -! if test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then +! if test -f "$JFRAMEDIR/Headers/jni.h"; then +! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Headers" +! elif test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then ! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Versions/1.3.1/Headers" ! else ! { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; }