diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-06-14 21:22:36 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2005-06-14 21:22:36 +0000 |
| commit | 9aacd5f2f96123d0e2246c9f0bdfe560a07dd5c7 (patch) | |
| tree | 83fd5213e627a8401b8901e2e169ee1bfffb4ea9 /m4 | |
| parent | 69f8f076efb8bbade016bb5f7480b8a64b2d7f49 (diff) | |
| download | classpath-9aacd5f2f96123d0e2246c9f0bdfe560a07dd5c7.tar.gz | |
* m4/acinclude.m4 (--with-vm-classes): New option.
* lib/gen-classlist.sh.in: Handle 'vm_classes' feature.
* lib/Makefile.am (compile_classpath): Updated for new
classpath-setting approach.
(noinst_DATA): Now unconditional.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 431cfd0c0..8c8baf08d 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -301,6 +301,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 +314,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 +346,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])], |