diff options
| author | Dalibor Topic <robilad@yahoo.com> | 2008-02-10 23:28:10 +0000 |
|---|---|---|
| committer | Dalibor Topic <robilad@yahoo.com> | 2008-02-10 23:28:10 +0000 |
| commit | 37b4875653b5703f05fe29c33760378ece171fc6 (patch) | |
| tree | 4c70bee149426c8642460a2317e63ecd03e185a4 | |
| parent | a67d8778bc989feee09bc190d732a45b091982b5 (diff) | |
| download | classpath-37b4875653b5703f05fe29c33760378ece171fc6.tar.gz | |
2008-02-10 Dalibor Topic <robilad@kaffe.org>
* 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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 22 |
4 files changed, 10 insertions, 24 deletions
@@ -1,5 +1,13 @@ 2008-02-10 Dalibor Topic <robilad@kaffe.org> + * 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. + +2008-02-10 Dalibor Topic <robilad@kaffe.org> + * m4/acinclude.m4 (CLASSPATH_CHECK_JAVAH)[USER_JAVAH]: Check for gjavah-4.3. diff --git a/include/Makefile.am b/include/Makefile.am index d0c3b2598..07b59d517 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -4,7 +4,7 @@ DISTCLEANFILES = jni_md.h config-int.h $(H_FILES) 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 = \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 9bffead69..71cbe9ef9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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 diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e9e0bc23a..2a1c17a45 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -234,28 +234,6 @@ dnl CLASSPATH_WITH_CLASSLIB - checks for user specified classpath additions 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']) |