--- configure.orig	Fri Oct 19 11:58:59 2001
+++ configure	Sun Feb 24 02:29:56 2002
@@ -1604,7 +1604,7 @@
 fi
 if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH"
+  HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH/include"
 else
   echo "$ac_t""no" 1>&6
 
@@ -1629,7 +1629,7 @@
 fi
 if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH"
+  HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH/include"
 else
   echo "$ac_t""no" 1>&6
 
@@ -6882,10 +6882,7 @@
 fi
 
 	if ( test -n "$JAVAINCLUDES"); then
-		for i in `ls -l $JAVAPATH/include | grep drw | awk '{print $9}'`
-		do
-			JAVAINCLUDES="$JAVAINCLUDES -I$JAVAPATH/include/$i"
-		done
+		JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
 	fi
 fi
 
