1.1 --- a/ChangeLog	Tue Aug 05 08:20:38 2008 +0100
     1.2 +++ b/ChangeLog	Tue Aug 05 08:33:25 2008 +0100
     1.3 @@ -5,6 +5,13 @@
     1.4  ==============
     1.5  2008-08-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
     1.6  
     1.7 +	* configure.ac:
     1.8 +	Fix broken library location option.
     1.9 +	* lib/Makefile.am:
    1.10 +	Drop reflection classes for JamVM/OpenJDK.
    1.11 +
    1.12 +2008-08-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
    1.13 +
    1.14  	* src/symbol.h:
    1.15  	Remove #ifdefs in #define.
    1.16  	* src/thread.c:

     2.1 --- a/configure.ac	Tue Aug 05 08:20:38 2008 +0100
     2.2 +++ b/configure.ac	Tue Aug 05 08:33:25 2008 +0100
     2.3 @@ -248,15 +248,18 @@
     2.4  AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xclasspath")
     2.5  AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk")
     2.6  
     2.7 +AC_MSG_CHECKING(location of the Java runtime library)
     2.8  AC_ARG_WITH(java-runtime-library-install-dir,
     2.9      [AS_HELP_STRING(--with-java-runtime-library-install-dir=<dir>,installation directory of Java runtime library
    2.10 -                   (default /usr/local/classpath))],,
    2.11 +                   (default /usr/local/classpath))],
    2.12 +    [with_runtime_install_dir=${withval}],
    2.13      [with_runtime_install_dir=/usr/local/classpath])
    2.14  
    2.15  AC_DEFINE_UNQUOTED(RUNTIME_INSTALL_DIR, "$with_runtime_install_dir",
    2.16      [Java runtime library installation directory (prefix)])
    2.17  
    2.18  AC_SUBST(with_runtime_install_dir)
    2.19 +AC_MSG_RESULT(${with_runtime_install_dir})
    2.20  
    2.21  if test "$prefix" = "NONE"; then
    2.22      install_dir=$ac_default_prefix

     3.1 --- a/lib/Makefile.am	Tue Aug 05 08:20:38 2008 +0100
     3.2 +++ b/lib/Makefile.am	Tue Aug 05 08:33:25 2008 +0100
     3.3 @@ -41,15 +41,18 @@
     3.4               $(srcdir)/java/lang/VMString.java \
     3.5               $(srcdir)/java/lang/VMThread.java \
     3.6               $(srcdir)/java/lang/VMThrowable.java \
     3.7 -             $(srcdir)/java/lang/reflect/Constructor.java \
     3.8 -             $(srcdir)/java/lang/reflect/Field.java \
     3.9 -             $(srcdir)/java/lang/reflect/Method.java \
    3.10               $(srcdir)/java/security/VMAccessController.java \
    3.11               $(srcdir)/gnu/classpath/VMSystemProperties.java \
    3.12               $(srcdir)/sun/reflect/annotation/AnnotationInvocationHandler.java \
    3.13               $(srcdir)/gnu/classpath/VMStackWalker.java
    3.14  
    3.15 +if WITH_JAVA_RUNTIME_LIBRARY_CLASSPATH
    3.16 +             $(srcdir)/java/lang/reflect/Constructor.java \
    3.17 +             $(srcdir)/java/lang/reflect/Field.java \
    3.18 +             $(srcdir)/java/lang/reflect/Method.java
    3.19 +endif
    3.20  
    3.21 +JAVA_FILES += 
    3.22  inst_classes.zip: classes.zip
    3.23  	ln -fs $< $@
    3.24