diff options
| author | Brian Jones <cbj@gnu.org> | 1999-12-31 06:25:06 +0000 |
|---|---|---|
| committer | Brian Jones <cbj@gnu.org> | 1999-12-31 06:25:06 +0000 |
| commit | f50059f66d03d4be6e82052fd9bb8812e3defa6a (patch) | |
| tree | 72ba066d7cfdbeb7b8118ae77cd15451fa39c937 /acinclude.m4 | |
| parent | 4e274b7731f352f3d118a5158cb753e37e006aa5 (diff) | |
| download | classpath-f50059f66d03d4be6e82052fd9bb8812e3defa6a.tar.gz | |
added support for kjc/javac(again), see mail archives
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f85a9eda9..69d6e0b44 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -92,7 +92,7 @@ AC_DEFUN(CLASSPATH_INTERNAL_CHECK_KAFFE, AC_SUBST(JVM) AC_SUBST(JVM_REFERENCE) - dnl conditional_with_kaffe + conditional_with_kaffe=true AC_MSG_RESULT(yes) dnl define WITH_KAFFE for native compilation @@ -106,7 +106,23 @@ AC_DEFUN(CLASSPATH_INTERNAL_CHECK_KAFFE, _t_bindir=`$KAFFE_CONFIG info bindir` _t_datadir=`$KAFFE_CONFIG info datadir` AC_PATH_PROG(KAFFE_JABBA, kaffe, "", $_t_bindir:$PATH) - AC_PATH_PROG(KAFFE_JAVAC, kjc, "", $_t_bindir:$PATH) + + AC_MSG_CHECKING(for kjc) + if test -e $_t_datadir/kaffe/kjc.jar; then + KJC_CLASSPATH=$_t_datadir/kaffe/kjc.jar + AC_SUBST(KJC_CLASSPATH) + conditional_with_kjc=true + AC_MSG_RESULT(${withval}) + elif test -e $_t_datadir/kjc.jar; then + KJC_CLASSPATH=$_t_datadir/kjc.jar + AC_SUBST(KJC_CLASSPATH) + conditional_with_kjc=true + AC_MSG_RESULT(${withval}) + else + conditional_with_kjc=false + AC_MSG_RESULT(no) + fi + AC_PATH_PROG(KAFFE_JAVAH, kaffeh, "", $_t_bindir:$PATH) AC_MSG_CHECKING(for Kaffe classes) @@ -123,12 +139,6 @@ AC_DEFUN(CLASSPATH_INTERNAL_CHECK_KAFFE, AC_MSG_ERROR(no) fi AC_MSG_RESULT(yes) - if test -e $_t_datadir/kjc.jar; then - KAFFE_CLASSLIB=$KAFFE_CLASSLIB:$_t_datadir/kjc.jar - fi - if test -e $_t_datadir/kaffe/kjc.jar; then - KAFFE_CLASSLIB=$KAFFE_CLASSLIB:$_t_datadir/kaffe/kjc.jar - fi if test -e $_t_datadir/rmi.jar; then KAFFE_CLASSLIB=$KAFFE_CLASSLIB:$_t_datadir/rmi.jar fi |