diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-09-14 16:49:41 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-09-14 16:49:41 +0000 |
| commit | 4fd309d2e65690e08695dd1c35f632602ded8fbd (patch) | |
| tree | 3361ef87cf70a59933407c521e13730b5b0abee4 | |
| parent | afee9db31a894a1bae0af9df745d359427e7163b (diff) | |
| download | classpath-4fd309d2e65690e08695dd1c35f632602ded8fbd.tar.gz | |
2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
* m4/acinclude.m4:
Only require the class files to be built
to allow the tools and examples to be built,
not the installation of glibj.zip.
* tools/Makefile.am:
Check lib directly as well as glibj.zip
for boot classes.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 4 | ||||
| -rwxr-xr-x | tools/Makefile.am | 2 |
4 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,16 @@ +2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * examples/Makefile.am: + Check lib directly as well as glibj.zip + for boot classes. + * m4/acinclude.m4: + Only require the class files to be built + to allow the tools and examples to be built, + not the installation of glibj.zip. + * tools/Makefile.am: + Check lib directly as well as glibj.zip + for boot classes. + 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, diff --git a/examples/Makefile.am b/examples/Makefile.am index cefd1b62d..ff4780124 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,5 @@ ## Input file for automake to generate the Makefile.in used by configure -GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip' +GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib' if GCJ_JAVAC JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip' diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 5b9f5d247..172f54a58 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -138,7 +138,7 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ], *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;; esac], [EXAMPLESDIR="examples"]) - if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then + if test "x${build_class_files}" = xno; then EXAMPLESDIR="" fi AC_SUBST(EXAMPLESDIR) @@ -151,7 +151,7 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ], *) 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 + if test "x${build_class_files}" = xno; then TOOLSDIR="" fi AC_SUBST(TOOLSDIR) diff --git a/tools/Makefile.am b/tools/Makefile.am index 4585e0fa9..24a8a2dd8 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ ## Input file for automake to generate the Makefile.in used by configure -GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib/glibj.zip' +GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib' GLIBJ_CLASSPATH=asm # Setup the compiler to use the GNU Classpath library we just built. |