hi all,
I've removed the unused --with-classpath option, since it does the same
thing (afaict), as --with-glibj-zip does. This fixes the build for
builds using --with-glibj-zip, too.
cheers,
dalibor topic
2008-02-10 Dalibor Topic <[EMAIL PROTECTED]>
* lib/Makefile.am (compile_classpath), include/Makefile.am (JAVAH):
Replaced USER_CLASSLIB with PATH_TO_GLIBJ_ZIP.
* m4/acinclude.m4 (CLASSPATH_WITH_CLASSLIB)[--with-classpath]:
Removed unused option. It's superceded by --with-glibj-zip.
Index: include/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/include/Makefile.am,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile.am
--- include/Makefile.am 9 Feb 2008 21:16:19 -0000 1.84
+++ include/Makefile.am 10 Feb 2008 20:51:52 -0000
@@ -4,7 +4,7 @@ DISTCLEANFILES = jni_md.h config-int.h $
ARG_JNI_JAVAH = -jni
ARG_CLASSPATH_JAVAH = -bootclasspath
-JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) ../lib:$(USER_CLASSLIB)
+JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) ../lib:$(PATH_TO_GLIBJ_ZIP)
CLASSDIR = lib
SOUND_H_FILES = \
Index: lib/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile.am
--- lib/Makefile.am 28 Dec 2007 17:35:35 -0000 1.140
+++ lib/Makefile.am 10 Feb 2008 20:51:52 -0000
@@ -5,7 +5,7 @@ JAVA_DEPEND = java.dep
## this file and restart the make process again
sinclude $(JAVA_DEPEND)
-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER)
+compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER)
# handling source to bytecode compiler programs like gcj, jikes and kjc
if FOUND_ECJ
Index: m4/acinclude.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.30
diff -u -p -r1.30 acinclude.m4
--- m4/acinclude.m4 10 Feb 2008 20:18:57 -0000 1.30
+++ m4/acinclude.m4 10 Feb 2008 20:51:53 -0000
@@ -234,28 +234,6 @@ dnl CLASSPATH_WITH_CLASSLIB - checks for
dnl -----------------------------------------------------------
AC_DEFUN([CLASSPATH_WITH_CLASSLIB],
[
- AC_ARG_WITH([classpath],
- [AS_HELP_STRING(--with-classpath,specify path to a classes.zip like file)],
- [
- if test "x${withval}" = xyes; then
- # set user classpath to CLASSPATH from env
- AC_MSG_CHECKING(for classlib)
- USER_CLASSLIB=${CLASSPATH}
- AC_SUBST(USER_CLASSLIB)
- AC_MSG_RESULT(${USER_CLASSLIB})
- conditional_with_classlib=true
- elif test "x${withval}" != x && test "x${withval}" != xno; then
- # set user classpath to specified value
- AC_MSG_CHECKING(for classlib)
- USER_CLASSLIB=${withval}
- AC_SUBST(USER_CLASSLIB)
- AC_MSG_RESULT(${withval})
- conditional_with_classlib=true
- fi
- ],
- [ conditional_with_classlib=false ])
- AM_CONDITIONAL(USER_SPECIFIED_CLASSLIB, test "x${conditional_with_classlib}" = xtrue)
-
AC_ARG_WITH([vm-classes],
[AS_HELP_STRING(--with-vm-classes,specify path to VM override source files)], [vm_classes="$with_vm_classes"],
[vm_classes='${top_srcdir}/vm/reference'])
