I'm checking this in.
gcjx is dead, so I'm removing the build system support for it.
Tom
Index: ChangeLog
from Tom Tromey <[EMAIL PROTECTED]>
* examples/Makefile.am: Removed gcjx code.
* lib/Makefile.am: Removed gcjx code.
* tools/Makefile.am: Removed gcjx code.
* m4/acinclude.m4 (CLASSPATH_FIND_JAVAC): Removed gcjx code.
(CLASSPATH_WITH_GCJX): Removed.
(CLASSPATH_CHECK_GCJX): Likewise.
Index: examples/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- examples/Makefile.am 10 Dec 2006 20:25:40 -0000 1.16
+++ examples/Makefile.am 13 Dec 2006 19:24:27 -0000
@@ -8,14 +8,10 @@
#if FOUND_JIKES
#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath
$(top_builddir)/lib:.
#else
-if FOUND_GCJX
-JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath '' -sourcepath ''
-classpath $(GLIBJ_CLASSPATH):.
-else
if FOUND_ECJ
JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH)
-classpath .
else
error dunno how to setup the JCOMPILER and compile
-endif
#endif
#endif
endif
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.129
diff -u -r1.129 Makefile.am
--- lib/Makefile.am 10 Dec 2006 20:25:49 -0000 1.129
+++ lib/Makefile.am 13 Dec 2006 19:24:35 -0000
@@ -27,10 +27,6 @@
#if FOUND_KJC
### FIXME: from what I can tell, kjc does not support a -encoding option.
#JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
-else
-if FOUND_GCJX
-JAVAC = $(GCJX) -g -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes
-endif # FOUND_GCJX
#endif # FOUND_KJC
#endif # FOUND_GCJ
#endif # FOUND_JIKES
Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.13
diff -u -r1.13 acinclude.m4
--- m4/acinclude.m4 10 Dec 2006 20:25:49 -0000 1.13
+++ m4/acinclude.m4 13 Dec 2006 19:24:35 -0000
@@ -8,7 +8,6 @@
dnl CLASSPATH_WITH_GCJ
dnl CLASSPATH_WITH_JIKES
dnl CLASSPATH_WITH_KJC
- CLASSPATH_WITH_GCJX
CLASSPATH_WITH_ECJ
if test "x${user_specified_javac}" = x; then
@@ -21,11 +20,10 @@
AM_CONDITIONAL(FOUND_ECJ, test "x${user_specified_javac}" = xecj)
fi
dnl AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
- AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx)
-dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test
"x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx;
then
- if test "x${ECJ}" = x && test "x${user_specified_javac}" != xecj && test
"x${user_specified_javac}" != xgcjx; then
- AC_MSG_ERROR([cannot find javac, try --with-ecj or --with-gcjx])
+dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test
"x${user_specified_javac}" != xkjc; then
+ if test "x${ECJ}" = x && test "x${user_specified_javac}" != xecj; then
+ AC_MSG_ERROR([cannot find javac, try --with-ecj])
fi
])
@@ -185,41 +183,6 @@
])
dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_WITH_GCJX],
-[
- AC_ARG_WITH([gcjx],
- [AS_HELP_STRING(--with-gcjx,bytecode compilation with gcjx)],
- [
- if test "x${withval}" != x && test "x${withval}" != xyes && test
"x${withval}" != xno; then
- CLASSPATH_CHECK_GCJX(${withval})
- else
- if test "x${withval}" != xno; then
- CLASSPATH_CHECK_GCJX
- fi
- fi
- user_specified_javac=gcjx
- ],
- [
- CLASSPATH_CHECK_GCJX
- ])
- AC_SUBST(GCJX)
-])
-
-dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_CHECK_GCJX],
-[
- if test "x$1" != x; then
- if test -f "$1"; then
- GCJX="$1"
- else
- AC_PATH_PROG(GCJX, "$1")
- fi
- else
- AC_PATH_PROG(GCJX, "gcjx")
- fi
-])
-
-dnl -----------------------------------------------------------
AC_DEFUN([CLASSPATH_WITH_JAVAH],
[
AC_ARG_WITH([javah],
Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- tools/Makefile.am 13 Dec 2006 17:56:44 -0000 1.30
+++ tools/Makefile.am 13 Dec 2006 19:24:38 -0000
@@ -3,16 +3,12 @@
GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip'
GLIBJ_CLASSPATH=asm
-# Setup the compiler to use the GNU Classpath library we just build
-if FOUND_GCJX
-JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH)
-sourcepath '' -classpath $(GLIBJ_CLASSPATH):.
-else
+# Setup the compiler to use the GNU Classpath library we just built.
if FOUND_ECJ
JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH)
-classpath .:$(GLIBJ_CLASSPATH)
else
error dunno how to setup the JCOMPILER and compile
endif
-endif
if CREATE_WRAPPERS
bin_SCRIPTS =
