23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
|
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original 2005-10-31 15:05:55.000000000 -0500
|
||
|
|
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2005-10-31 15:11:31.000000000 -0500
|
||
|
|
@@ -104,7 +104,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.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original 2005-10-31 15:06:34.000000000 -0500
|
||
|
|
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2005-10-31 15:08:13.000000000 -0500
|
||
|
|
@@ -52,7 +52,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");
|