diff options
Diffstat (limited to 'm4/acinclude.m4')
| -rw-r--r-- | m4/acinclude.m4 | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 431cfd0c0..e9cb21e27 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -147,7 +147,7 @@ AC_DEFUN([CLASSPATH_CHECK_JIKES], JIKES_VERSION=`$JIKES --version | awk '/^Jikes Compiler/' | cut -d ' ' -f 5` JIKES_VERSION_MAJOR=`echo "$JIKES_VERSION" | cut -d '.' -f 1` JIKES_VERSION_MINOR=`echo "$JIKES_VERSION" | cut -d '.' -f 2` - if expr "$JIKES_VERSION_MAJOR" == 1 > /dev/null; then + if expr "$JIKES_VERSION_MAJOR" = 1 > /dev/null; then if expr "$JIKES_VERSION_MINOR" \< 19 > /dev/null; then JIKES="" fi @@ -157,6 +157,12 @@ AC_DEFUN([CLASSPATH_CHECK_JIKES], else AC_MSG_WARN($JIKES_VERSION: jikes 1.19 or higher required) fi + + JIKESENCODING= + if test -n "`$JIKES --help 2>&1 | grep encoding`"; then + JIKESENCODING='-encoding UTF-8' + fi + AC_SUBST(JIKESENCODING) fi ]) @@ -301,6 +307,11 @@ AC_DEFUN([CLASSPATH_WITH_CLASSLIB], ], [ conditional_with_classlib=false ]) AM_CONDITIONAL(USER_SPECIFIED_CLASSLIB, test "x${conditional_with_classlib}" = xtrue) + + AC_ARG_WITH([vm-classes], + [AS_HELP_STRING(--with-vm-classes,specify path to VM override source files)], [vm_classes="$with_vm_classes"], + [vm_classes='${top_srcdir}/vm/reference']) + AC_SUBST(vm_classes) ]) dnl ----------------------------------------------------------- @@ -309,20 +320,28 @@ dnl ----------------------------------------------------------- AC_DEFUN([CLASSPATH_WITH_GLIBJ], [ AC_ARG_WITH([glibj], - [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none) [default=zip]])], + [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])], [ if test "x${withval}" = xyes || test "x${withval}" = xzip; then AC_PATH_PROG(ZIP, zip) install_class_files=no + build_class_files=yes elif test "x${withval}" = xboth; then AC_PATH_PROG(ZIP, zip) install_class_files=yes + build_class_files=yes elif test "x${withval}" = xflat; then ZIP= install_class_files=yes + build_class_files=yes elif test "x${withval}" = xno || test "x${withval}" = xnone; then ZIP= install_class_files=no + build_class_files=no + elif test "x${withval}" = xbuild; then + ZIP= + install_class_files=no + build_class_files=yes else AC_MSG_ERROR([unknown value given to --with-glibj]) fi @@ -333,6 +352,7 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ], ]) AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x) AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes) + AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes) AC_ARG_ENABLE([examples], [AS_HELP_STRING(--enable-examples,enable build of the examples [default=yes])], |