This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Simplify building of tools and examples
- From: Andrew Haley <aph at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: Mon, 22 Sep 2008 15:24:17 +0100
- Subject: FYI: Simplify building of tools and examples
A patch from Classpath applied to classpath-098-merge-branch.
Andrew.
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.
Index: m4/acinclude.m4
===================================================================
--- m4/acinclude.m4 (revision 140485)
+++ m4/acinclude.m4 (working copy)
@@ -138,7 +138,7 @@
*) 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_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)
Index: configure
===================================================================
--- configure (revision 140485)
+++ configure (working copy)
@@ -25043,7 +25043,7 @@
else
EXAMPLESDIR="examples"
fi;
- if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then
+ if test "x${build_class_files}" = xno; then
EXAMPLESDIR=""
fi
@@ -25061,7 +25061,7 @@
else
TOOLSDIR="tools"
fi;
- if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then
+ if test "x${build_class_files}" = xno; then
TOOLSDIR=""
fi
Index: examples/Makefile.am
===================================================================
--- examples/Makefile.am (revision 140485)
+++ examples/Makefile.am (working copy)
@@ -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'