diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-12-13 19:25:28 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-12-13 19:25:28 +0000 |
| commit | b4c3894835a7fc86f600a84922cb840a39cd160c (patch) | |
| tree | 40417ca55f476521fc8a3ebd1ec0b35e1ce59dc7 /m4 | |
| parent | 94fb11484923fc9c10432838ef1f9a7e4b8139e1 (diff) | |
| download | classpath-b4c3894835a7fc86f600a84922cb840a39cd160c.tar.gz | |
* 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.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 3a8abe0b1..9404b4283 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -8,7 +8,6 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC], 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 @@ dnl AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes) 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 @@ AC_DEFUN([CLASSPATH_CHECK_KJC], ]) 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], |