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

	* resource/com/sun/tools/javac/messages.properties
	(Main.FailedToRead, Main.MalformedURL, Main.FailedToLoad): Clarify
	messages for when --with-ecj-jar is not specified.
	* configure.ac (FOUND_ECJ_JAR): Remove conditional.
	* tools/Makefile.am: Build com.sun.tools.javac package
	unconditionally.
	* configure, doc/api/Makefile.in, doc/Makefile.in,
	examples/Makefile.in, external/jsr166/Makefile.in,
	external/Makefile.in, external/relaxngDatatype/Makefile.in,
	external/sax/Makefile.in, external/w3c_dom/Makefile.in,
	include/Makefile.in, lib/Makefile.in, Makefile.in,
	native/fdlibm/Makefile.in, native/jawt/Makefile.in,
	native/jni/classpath/Makefile.in,
	native/jni/gconf-peer/Makefile.in,
	native/jni/gtk-peer/Makefile.in, native/jni/java-io/Makefile.in,
	native/jni/java-lang/Makefile.in, native/jni/java-net/Makefile.in,
	native/jni/java-nio/Makefile.in, native/jni/java-util/Makefile.in,
	native/jni/Makefile.in, native/jni/midi-alsa/Makefile.in,
	native/jni/midi-dssi/Makefile.in,
	native/jni/native-lib/Makefile.in, native/jni/qt-peer/Makefile.in,
	native/jni/xmlj/Makefile.in, native/Makefile.in,
	native/plugin/Makefile.in, resource/Makefile.in,
	scripts/Makefile.in, tools/Makefile.in: Regenerate.
	* tools/classes/com/sun/tools/javac: New directory.
	* tools/classes/com/sun/tools/javac/Main.class,
	tools/classes/com/sun/tools/javac/Messages.class: New files.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123015 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 120747cca6e7613b91750ce3dde0972f805d7dda..330fe70fc570602e1e01c962a54080c30d09a55a 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,32 @@
+2007-03-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       * resource/com/sun/tools/javac/messages.properties
+       (Main.FailedToRead, Main.MalformedURL, Main.FailedToLoad): Clarify
+       messages for when --with-ecj-jar is not specified.
+       * configure.ac (FOUND_ECJ_JAR): Remove conditional.
+       * tools/Makefile.am: Build com.sun.tools.javac package
+       unconditionally.
+       * configure, doc/api/Makefile.in, doc/Makefile.in,
+       examples/Makefile.in, external/jsr166/Makefile.in,
+       external/Makefile.in, external/relaxngDatatype/Makefile.in,
+       external/sax/Makefile.in, external/w3c_dom/Makefile.in,
+       include/Makefile.in, lib/Makefile.in, Makefile.in,
+       native/fdlibm/Makefile.in, native/jawt/Makefile.in,
+       native/jni/classpath/Makefile.in,
+       native/jni/gconf-peer/Makefile.in,
+       native/jni/gtk-peer/Makefile.in, native/jni/java-io/Makefile.in,
+       native/jni/java-lang/Makefile.in, native/jni/java-net/Makefile.in,
+       native/jni/java-nio/Makefile.in, native/jni/java-util/Makefile.in,
+       native/jni/Makefile.in, native/jni/midi-alsa/Makefile.in,
+       native/jni/midi-dssi/Makefile.in,
+       native/jni/native-lib/Makefile.in, native/jni/qt-peer/Makefile.in,
+       native/jni/xmlj/Makefile.in, native/Makefile.in,
+       native/plugin/Makefile.in, resource/Makefile.in,
+       scripts/Makefile.in, tools/Makefile.in: Regenerate.
+       * tools/classes/com/sun/tools/javac: New directory.
+       * tools/classes/com/sun/tools/javac/Main.class,
+       tools/classes/com/sun/tools/javac/Messages.class: New files.
+
 2007-03-16  Tom Tromey  <tromey@redhat.com>
 
        * tools/gnu/classpath/tools/javah/Main.java (run): Use class'

diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in
index cc6247f685662614f185a94b94750619c2fa5409..ac5a18eea94a6150221955d8abccf253f216a93f 100644 (file)
--- a/libjava/classpath/Makefile.in
+++ b/libjava/classpath/Makefile.in
@@ -165,8 +165,6 @@ 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/configure b/libjava/classpath/configure
index ad005c18fd3999b16dfebec2c6295b8ed197642d..ee74f49549d9a142db415abbe348e595bb5fad1e 100755 (executable)
--- a/libjava/classpath/configure
+++ b/libjava/classpath/configure
@@ -312,7 +312,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY FOUND_CACAO_TRUE FOUND_CACAO_FALSE CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH USER_SPECIFIED_JAVAH_TRUE USER_SPECIFIED_JAVAH_FALSE CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC GCJX ECJ FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE FOUND_GCJX_TRUE FOUND_GCJX_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR FOUND_ECJ_JAR_TRUE FOUND_ECJ_JAR_FALSE JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY FOUND_CACAO_TRUE FOUND_CACAO_FALSE CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH USER_SPECIFIED_JAVAH_TRUE USER_SPECIFIED_JAVAH_FALSE CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC GCJX ECJ FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE FOUND_GCJX_TRUE FOUND_GCJX_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -16129,16 +16129,6 @@ else
 fi;
 
 
-
-if test "$ECJ_JAR" != ""; then
-  FOUND_ECJ_JAR_TRUE=
-  FOUND_ECJ_JAR_FALSE='#'
-else
-  FOUND_ECJ_JAR_TRUE='#'
-  FOUND_ECJ_JAR_FALSE=
-fi
-
-
 # Check whether --enable-java-lang-system-explicit-initialization or --disable-java-lang-system-explicit-initialization was given.
 if test "${enable_java_lang_system_explicit_initialization+set}" = set; then
   enableval="$enable_java_lang_system_explicit_initialization"
@@ -20276,13 +20266,6 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${FOUND_ECJ_JAR_TRUE}" && test -z "${FOUND_ECJ_JAR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"FOUND_ECJ_JAR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FOUND_ECJ_JAR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${INSTALL_GLIBJ_ZIP_TRUE}" && test -z "${INSTALL_GLIBJ_ZIP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"INSTALL_GLIBJ_ZIP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -21141,8 +21124,6 @@ s,@MAINT@,$MAINT,;t t
 s,@LIBDEBUG@,$LIBDEBUG,;t t
 s,@INIT_LOAD_LIBRARY@,$INIT_LOAD_LIBRARY,;t t
 s,@ECJ_JAR@,$ECJ_JAR,;t t
-s,@FOUND_ECJ_JAR_TRUE@,$FOUND_ECJ_JAR_TRUE,;t t
-s,@FOUND_ECJ_JAR_FALSE@,$FOUND_ECJ_JAR_FALSE,;t t
 s,@JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@,$JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION,;t t
 s,@REMOVE@,$REMOVE,;t t
 s,@MKDIR@,$MKDIR,;t t

diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac
index c9e03abafb974613f2056469d0a11825317a4572..7341a1c17a9b13aa072b73b5b9f226a3a6c9fbbe 100644 (file)
--- a/libjava/classpath/configure.ac
+++ b/libjava/classpath/configure.ac
@@ -729,7 +729,6 @@ AC_ARG_WITH([ecj-jar],
               ECJ_JAR='$(jardir)/ecj.jar'
             fi])
 AC_SUBST(ECJ_JAR)
-AM_CONDITIONAL(FOUND_ECJ_JAR, test "$ECJ_JAR" != "")
 
 dnl -----------------------------------------------------------
 dnl Should the VM explicitly run class initialization subfunctions for

diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in
index 7ff3f75b6ea0e5970a3a3e4e10ef370824cb3d41..30302bb5eb28948267787f61c3d1d4f1fbc6a335 100644 (file)
--- a/libjava/classpath/doc/Makefile.in
+++ b/libjava/classpath/doc/Makefile.in
@@ -142,8 +142,6 @@ 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/doc/api/Makefile.in b/libjava/classpath/doc/api/Makefile.in
index 36f026185362f3e6ce805f036c333d27c5f1133a..395885aa33998862b57c385b458c8adddeef182a 100644 (file)
--- a/libjava/classpath/doc/api/Makefile.in
+++ b/libjava/classpath/doc/api/Makefile.in
@@ -131,8 +131,6 @@ 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/examples/Makefile.in b/libjava/classpath/examples/Makefile.in
index 8bc5a159fc21284bb8d93cd3b66a3e990e98f692..647203779c055b5050f78e7bf6c8902750e1482e 100644 (file)
--- a/libjava/classpath/examples/Makefile.in
+++ b/libjava/classpath/examples/Makefile.in
@@ -140,8 +140,6 @@ 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/external/Makefile.in b/libjava/classpath/external/Makefile.in
index aabc4508d17f4ae9e632b43f126eb970b79a6420..16b6c88ba157c74a091cd74bf4c6e05262bd1385 100644 (file)
--- a/libjava/classpath/external/Makefile.in
+++ b/libjava/classpath/external/Makefile.in
@@ -138,8 +138,6 @@ 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/external/jsr166/Makefile.in b/libjava/classpath/external/jsr166/Makefile.in
index 68b8933953dcd99c490e45a3ca11ebe63d432b27..fdf5ac0665981dab8f61d3679e3dc51002f15325 100644 (file)
--- a/libjava/classpath/external/jsr166/Makefile.in
+++ b/libjava/classpath/external/jsr166/Makefile.in
@@ -129,8 +129,6 @@ 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/external/relaxngDatatype/Makefile.in b/libjava/classpath/external/relaxngDatatype/Makefile.in
index f94e51a4ff2dfa44d1eda038e4c7547c75124519..2b9af690ae1b258baf772c7b2a40bb8cebbc4514 100644 (file)
--- a/libjava/classpath/external/relaxngDatatype/Makefile.in
+++ b/libjava/classpath/external/relaxngDatatype/Makefile.in
@@ -129,8 +129,6 @@ 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/external/sax/Makefile.in b/libjava/classpath/external/sax/Makefile.in
index 8e3b10f3184f4077283fbf91ee8943fa7a634c1b..f3490b47e9c1fe1cef0fea9c86f8d0cabd0e9677 100644 (file)
--- a/libjava/classpath/external/sax/Makefile.in
+++ b/libjava/classpath/external/sax/Makefile.in
@@ -129,8 +129,6 @@ 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/external/w3c_dom/Makefile.in b/libjava/classpath/external/w3c_dom/Makefile.in
index 4c22e471bc038fa32c2bcd7ec751267e5feb467b..12af325e587b04fe5bff7b61de6c46c3fed50d28 100644 (file)
--- a/libjava/classpath/external/w3c_dom/Makefile.in
+++ b/libjava/classpath/external/w3c_dom/Makefile.in
@@ -129,8 +129,6 @@ 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/include/Makefile.in b/libjava/classpath/include/Makefile.in
index c18e5a2f513ca417818b647243d2d57b41a567c4..aba1fb2235d4438b8823cd9ee6c124b7a01be96e 100644 (file)
--- a/libjava/classpath/include/Makefile.in
+++ b/libjava/classpath/include/Makefile.in
@@ -130,8 +130,6 @@ 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/lib/Makefile.in b/libjava/classpath/lib/Makefile.in
index d31e636db1a7f57b7c4aefd9b25cd69fccb0e6d5..072d4f3c6bcf649deaf58798a709bb44aed454fd 100644 (file)
--- a/libjava/classpath/lib/Makefile.in
+++ b/libjava/classpath/lib/Makefile.in
@@ -134,8 +134,6 @@ 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/Makefile.in b/libjava/classpath/native/Makefile.in
index 43f4b738e4ff54b551c5f2c58c0cecf2c0be4ae8..30e8bb6de2d3e1911e341bb79d04ec15f04dde04 100644 (file)
--- a/libjava/classpath/native/Makefile.in
+++ b/libjava/classpath/native/Makefile.in
@@ -137,8 +137,6 @@ 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 c7e71d98bad5d9f860a0df8be0f36be298445a22..479ae663581933bd2d3613184cb28e7971a05095 100644 (file)
--- a/libjava/classpath/native/fdlibm/Makefile.in
+++ b/libjava/classpath/native/fdlibm/Makefile.in
@@ -156,8 +156,6 @@ 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 71eac7405b226c65ace3a87e876f4effda3d5ae5..02582ee8be52f89a9f2fe28b6755a004b7997330 100644 (file)
--- a/libjava/classpath/native/jawt/Makefile.in
+++ b/libjava/classpath/native/jawt/Makefile.in
@@ -156,8 +156,6 @@ 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 1890b42283d8b5fcebdfc76a35ac2ca0224fd3f4..bb63e73806d5cfa5eb1499cf452f57d4028825e1 100644 (file)
--- a/libjava/classpath/native/jni/Makefile.in
+++ b/libjava/classpath/native/jni/Makefile.in
@@ -137,8 +137,6 @@ 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 50e717761834a08274f456a0f98e3e8ef1431e39..63a05a9cdf0a7b132daf3fa9f85619c8be517f66 100644 (file)
--- a/libjava/classpath/native/jni/classpath/Makefile.in
+++ b/libjava/classpath/native/jni/classpath/Makefile.in
@@ -147,8 +147,6 @@ 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 3642c1d501f6966d13791f76e2fed2ce8b5a5d1c..f3845c2e929ca5e37e32283fb7e7798805679a48 100644 (file)
--- a/libjava/classpath/native/jni/gconf-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in
@@ -157,8 +157,6 @@ 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 ea5d7cf4f31fe25c8ddb36771917d9c58e719af5..fd2aa15893058a5c4a11a5e8b3f3e69611df349b 100644 (file)
--- a/libjava/classpath/native/jni/gtk-peer/Makefile.in
+++ b/libjava/classpath/native/jni/gtk-peer/Makefile.in
@@ -196,8 +196,6 @@ 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 2e741a9104e9a30b859b7a50b838ddc130636555..2d61a8104d5eb5d2c301885b2ea552e1e4b03c7a 100644 (file)
--- a/libjava/classpath/native/jni/java-io/Makefile.in
+++ b/libjava/classpath/native/jni/java-io/Makefile.in
@@ -158,8 +158,6 @@ 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 2bb1abdb201fe4172b1e875f81549051ffafb539..f8d53a7db972bcc15e777e1b05670ff1afcec244 100644 (file)
--- a/libjava/classpath/native/jni/java-lang/Makefile.in
+++ b/libjava/classpath/native/jni/java-lang/Makefile.in
@@ -164,8 +164,6 @@ 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 f66f6c78ddf42af9bb22509d810a90b9a72013ff..612eb805664691762fa204cefada916dfb65e75c 100644 (file)
--- a/libjava/classpath/native/jni/java-net/Makefile.in
+++ b/libjava/classpath/native/jni/java-net/Makefile.in
@@ -168,8 +168,6 @@ 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 5e0fecf9e19dce1750a2f2262c6f36417961ca20..83b1b0fcac43b2d3218253c8739548281f6a5258 100644 (file)
--- a/libjava/classpath/native/jni/java-nio/Makefile.in
+++ b/libjava/classpath/native/jni/java-nio/Makefile.in
@@ -166,8 +166,6 @@ 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 dc5987deafdd75949d9d3d38615ed7b5253b0b7d..133f49da382f59963ab45e5620c509d7f77e674e 100644 (file)
--- a/libjava/classpath/native/jni/java-util/Makefile.in
+++ b/libjava/classpath/native/jni/java-util/Makefile.in
@@ -155,8 +155,6 @@ 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 c8374b1428eab6913e3a0b0a8c3b4d439a008e18..e088b3a00218757cdfba78da9554fe97a65adf27 100644 (file)
--- a/libjava/classpath/native/jni/midi-alsa/Makefile.in
+++ b/libjava/classpath/native/jni/midi-alsa/Makefile.in
@@ -158,8 +158,6 @@ 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 a282ca2f680969aab2948b5f88130ff189d3910c..be35acfbf10f9f09f0e5ba840ffbd526e6422372 100644 (file)
--- a/libjava/classpath/native/jni/midi-dssi/Makefile.in
+++ b/libjava/classpath/native/jni/midi-dssi/Makefile.in
@@ -158,8 +158,6 @@ 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 40a9c66ac2c0af3f68b623f76fcc0acfc7b6aa4b..0085ee86812799ca0ab408749fef1fa519892bfa 100644 (file)
--- a/libjava/classpath/native/jni/native-lib/Makefile.in
+++ b/libjava/classpath/native/jni/native-lib/Makefile.in
@@ -147,8 +147,6 @@ 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 86673c3a6f82f0b9a46da2c972055371a3efa251..9804982d624e9f8e69c10e3be09ecc7af3ae3c68 100644 (file)
--- a/libjava/classpath/native/jni/qt-peer/Makefile.in
+++ b/libjava/classpath/native/jni/qt-peer/Makefile.in
@@ -173,8 +173,6 @@ 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 883968bebc8f7dfc5b2baf9574e41c2640372f14..afff3f2367fc17a363c59f994ad6cf973305a9b1 100644 (file)
--- a/libjava/classpath/native/jni/xmlj/Makefile.in
+++ b/libjava/classpath/native/jni/xmlj/Makefile.in
@@ -157,8 +157,6 @@ 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 41729c879e72f47ea9ea988618cec84e62297037..fd7220a6b3cc1110c056404d1bf150a3c184638e 100644 (file)
--- a/libjava/classpath/native/plugin/Makefile.in
+++ b/libjava/classpath/native/plugin/Makefile.in
@@ -155,8 +155,6 @@ 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/resource/Makefile.in b/libjava/classpath/resource/Makefile.in
index 897955656ea62cec11140b8336480cd91f57cd78..8ded0988ebb17d5e4ea3a57dce8d210687da344b 100644 (file)
--- a/libjava/classpath/resource/Makefile.in
+++ b/libjava/classpath/resource/Makefile.in
@@ -140,8 +140,6 @@ 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/resource/com/sun/tools/javac/messages.properties b/libjava/classpath/resource/com/sun/tools/javac/messages.properties
index 58ba926f08995b3668a093b927a5463c8ce9c80c..995e871d9cff50fef787db07d1548cebc1728281 100644 (file)
--- a/libjava/classpath/resource/com/sun/tools/javac/messages.properties
+++ b/libjava/classpath/resource/com/sun/tools/javac/messages.properties
@@ -35,8 +35,8 @@
 # obligated to do so.  If you do not wish to do so, delete this
 # exception statement from your version.
 
-Main.FailedToRead:failed to read {0}
-Main.MalformedURL:malformed URL for {0}
-Main.FailedToLoad:failed to load {0} from {1}
+Main.FailedToRead:failed to read ecj.jar (reconfigure with --with-ecj-jar): {0}
+Main.MalformedURL:malformed URL for ecj.jar: {0}
+Main.FailedToLoad:failed to load {0} from ecj.jar: {1}
 Main.FailedConstructor:failed to find ecj constructor
 Main.FailedCompile:failed to find ecj compile method

diff --git a/libjava/classpath/scripts/Makefile.in b/libjava/classpath/scripts/Makefile.in
index dbeda952f4fe0b3246498f02391c146b1021a982..0700bcfdd7bd738fa0b449d66bb76f1a8195199a 100644 (file)
--- a/libjava/classpath/scripts/Makefile.in
+++ b/libjava/classpath/scripts/Makefile.in
@@ -130,8 +130,6 @@ 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/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index 22f0d026d7ba9cb3f91e7a80450e1a96e633b71e..6011ba64173f2f5cca470fbcbbb04baafeb86159 100755 (executable)
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -16,16 +16,6 @@ error dunno how to setup the JCOMPILER and compile
 endif
 endif
 
-if FOUND_ECJ_JAR
-COM_SUN_TOOLS_JAVAC = com/sun/tools/javac
-ABS_COM_SUN_TOOLS_JAVAC = $(srcdir)/$(COM_SUN_TOOLS_JAVAC)
-ABS_COM_SUN_TOOLS_JAVAC_SRCS = $(ABS_COM_SUN_TOOLS_JAVAC)/*.java
-else
-COM_SUN_TOOLS_JAVAC =
-ABS_COM_SUN_TOOLS_JAVAC =
-ABS_COM_SUN_TOOLS_JAVAC_SRCS =
-endif
-
 if CREATE_WRAPPERS
 bin_SCRIPTS =
 bin_PROGRAMS = gappletviewer gjarsigner gkeytool \
@@ -113,7 +103,7 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \
        $(srcdir)/com/sun/javadoc/*.java \
        $(srcdir)/com/sun/tools/doclets/*.java \
-       $(ABS_COM_SUN_TOOLS_JAVAC_SRCS) \
+       $(srcdir)/com/sun/tools/javac/*.java \
        $(srcdir)/sun/rmi/rmic/*.java \
        $(srcdir)/external/asm/org/objectweb/asm/*.java \
        $(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \
@@ -171,7 +161,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
        find $(srcdir)/gnu/classpath/tools \
             $(srcdir)/com/sun/javadoc \
             $(srcdir)/com/sun/tools/doclets \
-            $(ABS_COM_SUN_TOOLS_JAVAC) \
+            $(srcdir)/com/sun/tools/javac \
             $(srcdir)/sun/rmi/rmic \
             -name '*.java' -print > classes.lst
        if [ -f $(top_builddir)/../vm-tools-packages ]; then \
@@ -190,7 +180,7 @@ if JAVA_MAINTAINER_MODE
        $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst
 ## Copy over tools resource files.
        @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
-              com/sun/javadoc com/sun/tools/doclets $(COM_SUN_TOOLS_JAVAC) \
+              com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
               sun/rmi/rmic -name \*.properties -print`; \
        for p in $$list; do \
          dirname=classes/`dirname $$p`; \

diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index 884658378af932446a60953893b2aeb2465ca644..72a1dd6a8fe0a4d39956af1c4974494b63f84512 100644 (file)
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -232,8 +232,6 @@ 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@
@@ -398,12 +396,6 @@ GLIBJ_CLASSPATH = $(srcdir)/asm
 
 # Setup the compiler to use the GNU Classpath library we just build
 @FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):.
-@FOUND_ECJ_JAR_FALSE@COM_SUN_TOOLS_JAVAC = 
-@FOUND_ECJ_JAR_TRUE@COM_SUN_TOOLS_JAVAC = com/sun/tools/javac
-@FOUND_ECJ_JAR_FALSE@ABS_COM_SUN_TOOLS_JAVAC = 
-@FOUND_ECJ_JAR_TRUE@ABS_COM_SUN_TOOLS_JAVAC = $(srcdir)/$(COM_SUN_TOOLS_JAVAC)
-@FOUND_ECJ_JAR_FALSE@ABS_COM_SUN_TOOLS_JAVAC_SRCS = 
-@FOUND_ECJ_JAR_TRUE@ABS_COM_SUN_TOOLS_JAVAC_SRCS = $(ABS_COM_SUN_TOOLS_JAVAC)/*.java
 @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = 
 @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \
 @CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@@ -483,7 +475,7 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \
        $(srcdir)/com/sun/javadoc/*.java \
        $(srcdir)/com/sun/tools/doclets/*.java \
-       $(ABS_COM_SUN_TOOLS_JAVAC_SRCS) \
+       $(srcdir)/com/sun/tools/javac/*.java \
        $(srcdir)/sun/rmi/rmic/*.java \
        $(srcdir)/external/asm/org/objectweb/asm/*.java \
        $(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \
@@ -1094,7 +1086,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
        find $(srcdir)/gnu/classpath/tools \
             $(srcdir)/com/sun/javadoc \
             $(srcdir)/com/sun/tools/doclets \
-            $(ABS_COM_SUN_TOOLS_JAVAC) \
+            $(srcdir)/com/sun/tools/javac \
             $(srcdir)/sun/rmi/rmic \
             -name '*.java' -print > classes.lst
        if [ -f $(top_builddir)/../vm-tools-packages ]; then \
@@ -1110,7 +1102,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
 @JAVA_MAINTAINER_MODE_TRUE@      $$AC -g -w -d $(srcdir)/asm @asm.lst
 @JAVA_MAINTAINER_MODE_TRUE@    $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst
 @JAVA_MAINTAINER_MODE_TRUE@    @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
-@JAVA_MAINTAINER_MODE_TRUE@           com/sun/javadoc com/sun/tools/doclets $(COM_SUN_TOOLS_JAVAC) \
+@JAVA_MAINTAINER_MODE_TRUE@           com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
 @JAVA_MAINTAINER_MODE_TRUE@           sun/rmi/rmic -name \*.properties -print`; \
 @JAVA_MAINTAINER_MODE_TRUE@    for p in $$list; do \
 @JAVA_MAINTAINER_MODE_TRUE@      dirname=classes/`dirname $$p`; \

diff --git a/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class b/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class
new file mode 100644 (file)
index 0000000..ac08078
Binary files /dev/null and b/libjava/classpath/tools/classes/com/sun/tools/javac/Main.class differ

diff --git a/libjava/classpath/tools/classes/com/sun/tools/javac/Messages.class b/libjava/classpath/tools/classes/com/sun/tools/javac/Messages.class
new file mode 100644 (file)
index 0000000..50ced90
Binary files /dev/null and b/libjava/classpath/tools/classes/com/sun/tools/javac/Messages.class differ