diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-01 18:47:01 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-01 18:47:01 +0000 |
| commit | d5963dd753dfe4706180b4bc235ad90ca978f254 (patch) | |
| tree | 299806ffbff104ebc537a789e5bd0a0c815eda16 | |
| parent | b7a9629aac342c6381c8b8e93cb54d63dd0a322c (diff) | |
| download | classpath-d5963dd753dfe4706180b4bc235ad90ca978f254.tar.gz | |
2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am: Replace tools with
$(TOOLSDIR).
* m4/acinclude.m4: Include option
to disable building the tools.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 13 |
3 files changed, 21 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + * Makefile.am: Replace tools with + $(TOOLSDIR). + * m4/acinclude.m4: Include option + to disable building the tools. + +2008-06-01 Andrew John Hughes <gnu_andrew@member.fsf.org> + * Makefile.am: Use default makedistcheck flags that test all optional dependencies. * configure.ac: Set version to 0.97.2-pre. diff --git a/Makefile.am b/Makefile.am index 6c80d064d..0991b262a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Input file for automake to generate the Makefile.in used by configure # lib first, to compile .class files before native code, last examples -SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) +SUBDIRS = lib doc external include native resource scripts $(TOOLSDIR) $(EXAMPLESDIR) DIST_SUBDIRS = lib doc external include native resource scripts tools examples # Allow users to pass site-specific flags to autoreconf via an env var. diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 476a03467..1161f524c 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -115,6 +115,19 @@ dnl We disable ZIP by default if we find fastjar. EXAMPLESDIR="" fi AC_SUBST(EXAMPLESDIR) + + AC_ARG_ENABLE([tools], + [AS_HELP_STRING(--enable-tools,enable build of the tools [default=yes])], + [case "${enableval}" in + yes) TOOLSDIR="tools" ;; + no) TOOLSDIR="" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;; + esac], + [TOOLSDIR="tools"]) + if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then + TOOLSDIR="" + fi + AC_SUBST(TOOLSDIR) ]) dnl ----------------------------------------------------------- |