diff options
author | Roman Kennke <roman@kennke.org> | 2006-06-30 10:27:32 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2006-06-30 10:27:32 +0000 |
commit | 2516ce4d035e0620978ed537c8c8e10fd7fd7103 (patch) | |
tree | fbd364c60ac8fc4832968e5c97aa860ca4d8669d | |
parent | af8fdbf114aebd8e5fbb614de9b6c0cab4faf02a (diff) | |
download | classpath-2516ce4d035e0620978ed537c8c8e10fd7fd7103.tar.gz |
2006-06-30 Roman Kennke <kennke@aicas.com>
* lib/Makefile.am: Added Escher dir/jar to classpath when
requested.
* configure.ac: Moved handling of standard.omit to a place
where it actually gets executed.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | lib/Makefile.am | 2 |
3 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2006-06-30 Roman Kennke <kennke@aicas.com> + + * lib/Makefile.am: Added Escher dir/jar to classpath when + requested. + * configure.ac: Moved handling of standard.omit to a place + where it actually gets executed. + 2006-06-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/TextComponent.java: Reformatted source code, diff --git a/configure.ac b/configure.ac index e3569dcc0..66b4c8bd8 100644 --- a/configure.ac +++ b/configure.ac @@ -746,6 +746,12 @@ fi AM_CONDITIONAL(ENABLE_LOCAL_SOCKETS, test "x$ENABLE_LOCAL_SOCKETS" = "xyes") +# Create standard.omit based on decisions we just made. +cp lib/standard.omit.in lib/standard.omit +if test x$use_escher != xtrue; then + echo gnu/java/awt/peer/x >> lib/standard.omit +fi + dnl ----------------------------------------------------------- dnl output files dnl ----------------------------------------------------------- @@ -808,9 +814,3 @@ fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh]) AC_OUTPUT - -# Create standard.omit based on decisions we just made. -cp lib/standard.omit.in lib/standard.omit -if test x$use_escher != xtrue; then - echo gnu/java/awt/peer/x >> lib/standard.omit -fi diff --git a/lib/Makefile.am b/lib/Makefile.am index e38808fd3..282c25579 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,7 +10,7 @@ propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax or metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print) iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) -compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB) +compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER) # handling source to bytecode compiler programs like gcj, jikes and kjc if FOUND_GCJ |