diff options
Diffstat (limited to 'libjava/classpath/m4/acinclude.m4')
| -rw-r--r-- | libjava/classpath/m4/acinclude.m4 | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libjava/classpath/m4/acinclude.m4 b/libjava/classpath/m4/acinclude.m4 index 96af881d5e7..1c5f9c70f1c 100644 --- a/libjava/classpath/m4/acinclude.m4 +++ b/libjava/classpath/m4/acinclude.m4 @@ -23,9 +23,9 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC], AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc) AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx) - 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${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx && test "x${user_specified_javac}" != xecj; then # FIXME: use autoconf error function - echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, or --with-gcjx" 1>&2 + echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj, or --with-gcjx" 1>&2 exit 1 fi ]) @@ -304,6 +304,19 @@ dnl ----------------------------------------------------------- AC_DEFUN([CLASSPATH_WITH_GLIBJ], [ AC_PATH_PROG(ZIP, zip) + AC_ARG_WITH([fastjar], + [AS_HELP_STRING([--with-fastjar=PATH], [define to use a fastjar style tool])], + [ + AC_MSG_CHECKING([for user supplied fastjar]) + FASTJAR=${withval} + AC_MSG_RESULT([${FASTJAR}]) + ], + [AC_PATH_PROG(FASTJAR, fastjar)]) +dnl We disable ZIP by default if we find fastjar. + if test x"${FASTJAR}" != x; then + ZIP="" + fi + AC_ARG_WITH([glibj], [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])], [ |
