--- apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig	2008-06-27 01:05:20.000000000 -0400

+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2008-07-10 17:08:05.793449901 -0400

@@ -134,7 +134,7 @@

         }

         kaffeDetected = false;

         try {

-            Class.forName("kaffe.util.NotImplemented");

+            Class.forName("gnu.classpath.Configuration");

             kaffeDetected = true;

         } catch (Throwable t) {

             // swallow as this simply doesn't seem to be Kaffe

--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig	2008-06-27 01:05:20.000000000 -0400

+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2008-07-10 17:08:05.801530455 -0400

@@ -56,7 +56,7 @@

     private Commandline setupKaffehCommand(Javah javah) {

         Commandline cmd = new Commandline();

-        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));

+        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));

         if (javah.getDestdir() != null) {

             cmd.createArgument().setValue("-d");

--- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java.orig	2008-06-27 01:05:21.000000000 -0400

+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java	2008-07-10 17:10:47.081449425 -0400

@@ -32,9 +32,7 @@

     // sorted by newest Kaffe version first

     private static final String[] N2A_CLASSNAMES = new String[] {

-        "gnu.classpath.tools.native2ascii.Native2Ascii",

-        // pre Kaffe 1.1.5

-        "kaffe.tools.native2ascii.Native2Ascii",

+        "gnu.classpath.tools.native2ascii.Native2ASCII",

     };

     /**