Makefile.am (AM_CXXFLAGS): Define ECJ_JAR_FILE.

2007-03-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

        * Makefile.am (AM_CXXFLAGS): Define ECJ_JAR_FILE.
        * classpath/configure.ac: Add --with-ecj-jar configure option.
        * classpath/gnu/classpath/Configuration.java.in (ECJ_JAR): New
        field.
        * classpath/INSTALL: Document --with-ecj-jar configure option and
        ecj jar requirement for com.sun.tools.javac support.
        * classpath/tools/Makefile.am: Build decendents of com and sun
        directories.
        * configure.ac: Substitute ECJ_JAR in stub Configuration.java.
        * gnu/classpath/Configuration.java,
        gnu/classpath/natConfiguration.cc (ecj): New method.
        (ECJ_JAR): New field.
        * scripts/makemake.tcl (scan_packages): Add com directory.
        * sources.am (property_files): Add
        classpath/resource/sun/rmi/rmic/messages.properties and
        classpath/resource/com/sun/tools/javac/messages.properties.
        * classpath/resource/com, classpath/resource/com/sun,
        classpath/resource/com/sun/tools,
        classpath/resource/com/sun/tools/javac, classpath/resource/sun,
        classpath/resource/sun/rmi, classpath/resource/sun/rmi/rmic,
        classpath/tools/classes/com, classpath/tools/classes/com/sun,
        classpath/tools/classes/com/sun/javadoc,
        classpath/tools/classes/com/sun/tools,
        classpath/tools/classes/com/sun/tools/doclets,
        classpath/tools/classes/sun, classpath/tools/classes/sun/rmi,
        classpath/tools/classes/sun/rmi/rmic, classpath/tools/com,
        classpath/tools/com/sun, classpath/tools/com/sun/javadoc,
        classpath/tools/com/sun/tools,
        classpath/tools/com/sun/tools/doclets,
        classpath/tools/com/sun/tools/javac, classpath/tools/sun,
        classpath/tools/sun/rmi, classpath/tools/sun/rmi/rmic: New
        directories.
        * classpath/resource/com/sun/tools/javac/messages.properties,
        classpath/resource/sun/rmi/rmic/messages.properties,
        classpath/tools/classes/com/sun/javadoc/ClassDoc.class,
        classpath/tools/classes/com/sun/javadoc/ConstructorDoc.class,
        classpath/tools/classes/com/sun/javadoc/Doc.class,
        classpath/tools/classes/com/sun/javadoc/DocErrorReporter.class,
        classpath/tools/classes/com/sun/javadoc/Doclet.class,
        classpath/tools/classes/com/sun/javadoc/ExecutableMemberDoc.class,
        classpath/tools/classes/com/sun/javadoc/FieldDoc.class,
        classpath/tools/classes/com/sun/javadoc/MemberDoc.class,
        classpath/tools/classes/com/sun/javadoc/MethodDoc.class,
        classpath/tools/classes/com/sun/javadoc/PackageDoc.class,
        classpath/tools/classes/com/sun/javadoc/ParamTag.class,
        classpath/tools/classes/com/sun/javadoc/Parameter.class,
        classpath/tools/classes/com/sun/javadoc/ProgramElementDoc.class,
        classpath/tools/classes/com/sun/javadoc/RootDoc.class,
        classpath/tools/classes/com/sun/javadoc/SeeTag.class,
        classpath/tools/classes/com/sun/javadoc/SerialFieldTag.class,
        classpath/tools/classes/com/sun/javadoc/SourcePosition.class,
        classpath/tools/classes/com/sun/javadoc/Tag.class,
        classpath/tools/classes/com/sun/javadoc/ThrowsTag.class,
        classpath/tools/classes/com/sun/javadoc/Type.class,
        classpath/tools/classes/com/sun/javadoc/TypeVariable.class,
        classpath/tools/classes/com/sun/tools/doclets/Taglet.class,
        classpath/tools/classes/sun/rmi/rmic/Main.class,
        classpath/tools/classes/sun/rmi/rmic/Messages.class,
        classpath/tools/com/sun/javadoc/ClassDoc.java,
        classpath/tools/com/sun/javadoc/ConstructorDoc.java,
        classpath/tools/com/sun/javadoc/Doc.java,
        classpath/tools/com/sun/javadoc/DocErrorReporter.java,
        classpath/tools/com/sun/javadoc/Doclet.java,
        classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java,
        classpath/tools/com/sun/javadoc/FieldDoc.java,
        classpath/tools/com/sun/javadoc/MemberDoc.java,
        classpath/tools/com/sun/javadoc/MethodDoc.java,
        classpath/tools/com/sun/javadoc/PackageDoc.java,
        classpath/tools/com/sun/javadoc/ParamTag.java,
        classpath/tools/com/sun/javadoc/Parameter.java,
        classpath/tools/com/sun/javadoc/ProgramElementDoc.java,
        classpath/tools/com/sun/javadoc/RootDoc.java,
        classpath/tools/com/sun/javadoc/SeeTag.java,
        classpath/tools/com/sun/javadoc/SerialFieldTag.java,
        classpath/tools/com/sun/javadoc/SourcePosition.java,
        classpath/tools/com/sun/javadoc/Tag.java,
        classpath/tools/com/sun/javadoc/ThrowsTag.java,
        classpath/tools/com/sun/javadoc/Type.java,
        classpath/tools/com/sun/javadoc/TypeVariable.java,
        classpath/tools/com/sun/tools/doclets/Taglet.java,
        classpath/tools/com/sun/tools/javac/Main.java,
        classpath/tools/com/sun/tools/javac/Messages.java,
        classpath/tools/sun/rmi/rmic/Main.java,
        classpath/tools/sun/rmi/rmic/Messages.java: New files.
        * Makefile.in, classpath/Makefile.in, classpath/configure,
        classpath/doc/Makefile.in, classpath/doc/api/Makefile.in,
        classpath/examples/Makefile.in, classpath/external/Makefile.in,
        classpath/external/jsr166/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/include/Makefile.in, classpath/include/config.h.in,
        classpath/lib/Makefile.in,
        classpath/lib/gnu/classpath/Configuration.class,
        classpath/native/Makefile.in, classpath/native/fdlibm/Makefile.in,
        classpath/native/jawt/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, configure,
        gnu/classpath/Configuration.h: Regenerate.

From-SVN: r122876

18 files changed, 54 insertions, 0 deletions

diff --git a/libjava/classpath/native/Makefile.in b/libjava/classpath/native/Makefile.in
index e258741..43f4b73 100644
--- a/libjava/classpath/native/Makefile.in
+++ b/libjava/classpath/native/Makefile.in
@@ -125,6 +125,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -136,6 +137,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/fdlibm/Makefile.in b/libjava/classpath/native/fdlibm/Makefile.in
index bad69b9..c7e71d9 100644
--- a/libjava/classpath/native/fdlibm/Makefile.in
+++ b/libjava/classpath/native/fdlibm/Makefile.in
@@ -144,6 +144,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -155,6 +156,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jawt/Makefile.in b/libjava/classpath/native/jawt/Makefile.in
index c0787b7..71eac74 100644
--- a/libjava/classpath/native/jawt/Makefile.in
+++ b/libjava/classpath/native/jawt/Makefile.in
@@ -144,6 +144,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -155,6 +156,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/Makefile.in b/libjava/classpath/native/jni/Makefile.in
index 333ab78..1890b42 100644
--- a/libjava/classpath/native/jni/Makefile.in
+++ b/libjava/classpath/native/jni/Makefile.in
@@ -125,6 +125,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -136,6 +137,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/classpath/Makefile.in b/libjava/classpath/native/jni/classpath/Makefile.in
index b9f19f5..50e7177 100644
--- a/libjava/classpath/native/jni/classpath/Makefile.in
+++ b/libjava/classpath/native/jni/classpath/Makefile.in
@@ -135,6 +135,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -146,6 +147,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.in b/libjava/classpath/native/jni/gconf-peer/Makefile.in
index 1a13a58..3642c1d 100644
--- a/libjava/classpath/native/jni/gconf-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in
@@ -145,6 +145,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -156,6 +157,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/gtk-peer/Makefile.in b/libjava/classpath/native/jni/gtk-peer/Makefile.in
index 5f10c0f..ea5d7cf 100644
--- a/libjava/classpath/native/jni/gtk-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gtk-peer/Makefile.in
@@ -184,6 +184,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -195,6 +196,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/java-io/Makefile.in b/libjava/classpath/native/jni/java-io/Makefile.in
index ed9a2e64..2e741a9 100644
--- a/libjava/classpath/native/jni/java-io/Makefile.in
+++ b/libjava/classpath/native/jni/java-io/Makefile.in
@@ -146,6 +146,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -157,6 +158,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/java-lang/Makefile.in b/libjava/classpath/native/jni/java-lang/Makefile.in
index 0109ee5..2bb1abd 100644
--- a/libjava/classpath/native/jni/java-lang/Makefile.in
+++ b/libjava/classpath/native/jni/java-lang/Makefile.in
@@ -152,6 +152,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -163,6 +164,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/java-net/Makefile.in b/libjava/classpath/native/jni/java-net/Makefile.in
index ad47131..f66f6c7 100644
--- a/libjava/classpath/native/jni/java-net/Makefile.in
+++ b/libjava/classpath/native/jni/java-net/Makefile.in
@@ -156,6 +156,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -167,6 +168,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/java-nio/Makefile.in b/libjava/classpath/native/jni/java-nio/Makefile.in
index 3109baa..5e0fecf 100644
--- a/libjava/classpath/native/jni/java-nio/Makefile.in
+++ b/libjava/classpath/native/jni/java-nio/Makefile.in
@@ -154,6 +154,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -165,6 +166,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/java-util/Makefile.in b/libjava/classpath/native/jni/java-util/Makefile.in
index a66bacd..dc5987d 100644
--- a/libjava/classpath/native/jni/java-util/Makefile.in
+++ b/libjava/classpath/native/jni/java-util/Makefile.in
@@ -143,6 +143,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -154,6 +155,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/midi-alsa/Makefile.in b/libjava/classpath/native/jni/midi-alsa/Makefile.in
index 843000d..c8374b1 100644
--- a/libjava/classpath/native/jni/midi-alsa/Makefile.in
+++ b/libjava/classpath/native/jni/midi-alsa/Makefile.in
@@ -146,6 +146,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -157,6 +158,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/midi-dssi/Makefile.in b/libjava/classpath/native/jni/midi-dssi/Makefile.in
index 177e9c3..a282ca2 100644
--- a/libjava/classpath/native/jni/midi-dssi/Makefile.in
+++ b/libjava/classpath/native/jni/midi-dssi/Makefile.in
@@ -146,6 +146,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -157,6 +158,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/native-lib/Makefile.in b/libjava/classpath/native/jni/native-lib/Makefile.in
index e3991a7..40a9c66 100644
--- a/libjava/classpath/native/jni/native-lib/Makefile.in
+++ b/libjava/classpath/native/jni/native-lib/Makefile.in
@@ -135,6 +135,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -146,6 +147,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.in b/libjava/classpath/native/jni/qt-peer/Makefile.in
index 671e392..86673c3 100644
--- a/libjava/classpath/native/jni/qt-peer/Makefile.in
+++ b/libjava/classpath/native/jni/qt-peer/Makefile.in
@@ -161,6 +161,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -172,6 +173,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/jni/xmlj/Makefile.in b/libjava/classpath/native/jni/xmlj/Makefile.in
index 693319a..883968b 100644
--- a/libjava/classpath/native/jni/xmlj/Makefile.in
+++ b/libjava/classpath/native/jni/xmlj/Makefile.in
@@ -145,6 +145,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -156,6 +157,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@
diff --git a/libjava/classpath/native/plugin/Makefile.in b/libjava/classpath/native/plugin/Makefile.in
index 11d74d4..41729c8 100644
--- a/libjava/classpath/native/plugin/Makefile.in
+++ b/libjava/classpath/native/plugin/Makefile.in
@@ -143,6 +143,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECJ = @ECJ@
+ECJ_JAR = @ECJ_JAR@
 EGREP = @EGREP@
 ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@
 ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@
@@ -154,6 +155,8 @@ FIND = @FIND@
 FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
 FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
 FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
+FOUND_ECJ_JAR_FALSE = @FOUND_ECJ_JAR_FALSE@
+FOUND_ECJ_JAR_TRUE = @FOUND_ECJ_JAR_TRUE@
 FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
 FOUND_GCJX_FALSE = @FOUND_GCJX_FALSE@
 FOUND_GCJX_TRUE = @FOUND_GCJX_TRUE@