PatchSet 5495 Date: 2005/02/07 15:46:43 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with gjdoc, fixed gjdoc's configure not to require java and javac
Members: ChangeLog:1.3540->1.3541 Makefile.in:1.199->1.200 aclocal.m4:1.119->1.120 configure:1.419->1.420 config/Makefile.in:1.170->1.171 include/Makefile.in:1.212->1.213 kaffe/Makefile.in:1.140->1.141 kaffe/jvmpi/Makefile.in:1.62->1.63 kaffe/kaffe/Makefile.in:1.160->1.161 kaffe/kaffeh/Makefile.in:1.140->1.141 kaffe/kaffevm/Makefile.in:1.190->1.191 kaffe/kaffevm/boehm-gc/Makefile.in:1.26->1.27 kaffe/kaffevm/gcj/Makefile.in:1.120->1.121 kaffe/kaffevm/intrp/Makefile.in:1.129->1.130 kaffe/kaffevm/jit/Makefile.in:1.135->1.136 kaffe/kaffevm/jit3/Makefile.in:1.106->1.107 kaffe/kaffevm/jni/Makefile.in:1.32->1.33 kaffe/kaffevm/kaffe-gc/Makefile.in:1.24->1.25 kaffe/kaffevm/systems/Makefile.in:1.128->1.129 kaffe/kaffevm/systems/beos-native/Makefile.in:1.120->1.121 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.126->1.127 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.130->1.131 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.103->1.104 kaffe/kaffevm/verifier/Makefile.in:1.31->1.32 kaffe/man/Makefile.in:1.126->1.127 kaffe/scripts/Makefile.in:1.163->1.164 kaffe/scripts/javadoc.in:1.7->1.8 kaffe/scripts/bat/Makefile.in:1.119->1.120 kaffe/scripts/compat/Makefile.in:1.144->1.145 kaffe/scripts/compat/javadoc.in:1.8->1.9 kaffe/xprof/Makefile.in:1.94->1.95 libraries/Makefile.in:1.123->1.124 libraries/clib/Makefile.in:1.137->1.138 libraries/clib/awt/Makefile.in:1.137->1.138 libraries/clib/awt/X/Makefile.in:1.128->1.129 libraries/clib/awt/classpath-gtk/Makefile.in:1.18->1.19 libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.24->1.25 libraries/clib/awt/classpath-gtk/resource/Makefile.in:1.17->1.18 libraries/clib/awt/nano-X/Makefile.in:1.1->1.2 libraries/clib/awt/qt/Makefile.in:1.85->1.86 libraries/clib/classpath/Makefile.in:1.10->1.11 libraries/clib/io/Makefile.in:1.132->1.133 libraries/clib/libxmlj/Makefile.in:1.37->1.38 libraries/clib/management/Makefile.in:1.139->1.140 libraries/clib/math/Makefile.in:1.134->1.135 libraries/clib/native/Makefile.in:1.171->1.172 libraries/clib/net/Makefile.in:1.143->1.144 libraries/clib/nio/Makefile.in:1.61->1.62 libraries/clib/security/Makefile.in:1.105->1.106 libraries/clib/sound/Makefile.in:1.32->1.33 libraries/clib/sound/alsa/Makefile.in:1.33->1.34 libraries/clib/sound/common/Makefile.in:1.32->1.33 libraries/clib/sound/esd/Makefile.in:1.33->1.34 libraries/clib/zip/Makefile.in:1.136->1.137 libraries/extensions/Makefile.in:1.115->1.116 libraries/extensions/comm/Makefile.in:1.109->1.110 libraries/extensions/comm/javalib/Makefile.in:1.109->1.110 libraries/extensions/microsoft/Makefile.in:1.101->1.102 libraries/extensions/microsoft/clib/Makefile.in:1.105->1.106 libraries/extensions/microsoft/javalib/Makefile.in:1.102->1.103 libraries/extensions/pjava/Makefile.in:1.109->1.110 libraries/extensions/pjava/javalib/Makefile.in:1.109->1.110 libraries/extensions/servlet/Makefile.in:1.109->1.110 libraries/extensions/servlet/javalib/Makefile.in:1.109->1.110 libraries/javalib/Makefile.in:1.391->1.392 libraries/javalib/awt-implementations/Makefile.in:1.17->1.18 libraries/javalib/awt-implementations/kaffe/Makefile.in:1.19->1.20 libraries/javalib/gmp-math/Makefile.in:1.21->1.22 m4/ac_prog_antlr.m4:1.2->1.3 m4/ac_prog_java.m4:1.1->1.2(DEAD) m4/ac_prog_java_works.m4:1.1->1.2(DEAD) m4/ac_prog_javac.m4:1.1->1.2(DEAD) m4/ac_prog_javac_works.m4:1.1->1.2(DEAD) replace/Makefile.in:1.74->1.75 test/Makefile.in:1.130->1.131 test/internal/Makefile.in:1.96->1.97 test/jni/Makefile.in:1.28->1.29 test/regression/Makefile.in:1.202->1.203 test/regression/compile_time/Makefile.in:1.60->1.61 test/regression/compiler/Makefile.in:1.42->1.43 test/regression/run_time/Makefile.in:1.59->1.60 tools/Makefile.in:1.33->1.34 tools/gjdoc/Makefile.in:1.33->1.34 tools/gjdoc/javalib/Makefile.am:1.12->1.13 tools/gjdoc/javalib/Makefile.in:1.43->1.44 tools/gjdoc/javalib/dtd/dbcentx.mod:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-amsa.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-amsb.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-amsc.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-amsn.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-amso.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-amsr.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-box.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-cyr1.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-cyr2.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-dia.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-grk1.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-grk2.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-grk3.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-grk4.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-lat1.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-lat2.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-num.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-pub.ent:1.2->1.3 tools/gjdoc/javalib/dtd/ent/iso-tech.ent:1.2->1.3 tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.4->1.5 tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java:1.4->1.5 tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.4->1.5 tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java:1.3->1.4 tools/gjdoc/javalib/gnu/classpath/tools/doclets/xmldoclet/Driver.java:1.4->1.5 tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/Main.java:1.6->1.7 tools/gjdoc/javalib/gnu/classpath/tools/java2xhtml/Java2xhtml.java:1.3->1.4 tools/gjdoc/javalib/htmldoclet/HtmlDoclet.properties:1.1->1.2 tools/gjdoc/javalib/htmldoclet/gjdoc.js:1.1->1.2 tools/gjdoc/javalib/htmldoclet/gjdochtml-clean-color1.css:1.1->1.2 tools/gjdoc/javalib/htmldoclet/gjdochtml-clean-layout.css:1.1->1.2 tools/gjdoc/javalib/htmldoclet/help.xhtml:1.2->1.3 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3540 kaffe/ChangeLog:1.3541 --- kaffe/ChangeLog:1.3540 Mon Feb 7 04:12:40 2005 +++ kaffe/ChangeLog Mon Feb 7 15:46:43 2005 @@ -1,5 +1,250 @@ 2005-02-07 Dalibor Topic <[EMAIL PROTECTED]> + * m4/ac_prog_antlr.m4: Simplified. No longer needs + java or javac. + + *m4/ac_prog_java.m4, + m4/ac_prog_java_works.m4, + m4/ac_prog_javac.m4, + m4/ac_prog_javac_works.m4: Removed. + + Reported by: Fernando Lozano <[EMAIL PROTECTED]> + + * kaffe/scripts/javadoc.in, + kaffe/scripts/compat/javadoc.in: Use installed antlr. + + * tools/gjdoc/javalib/Makefile.am (toolslib_DATA): + Don't copy antlr.jar around. + + Reported by: Arnaud Vandyck <[EMAIL PROTECTED]> + + * tools/gjdoc/javalib/dtd/dbcentx.mod, + tools/gjdoc/javalib/dtd/ent/iso-amsa.ent, + tools/gjdoc/javalib/dtd/ent/iso-amsb.ent, + tools/gjdoc/javalib/dtd/ent/iso-amsc.ent, + tools/gjdoc/javalib/dtd/ent/iso-amsn.ent, + tools/gjdoc/javalib/dtd/ent/iso-amso.ent, + tools/gjdoc/javalib/dtd/ent/iso-amsr.ent, + tools/gjdoc/javalib/dtd/ent/iso-box.ent, + tools/gjdoc/javalib/dtd/ent/iso-cyr1.ent, + tools/gjdoc/javalib/dtd/ent/iso-cyr2.ent, + tools/gjdoc/javalib/dtd/ent/iso-dia.ent, + tools/gjdoc/javalib/dtd/ent/iso-grk1.ent, + tools/gjdoc/javalib/dtd/ent/iso-grk2.ent, + tools/gjdoc/javalib/dtd/ent/iso-grk3.ent, + tools/gjdoc/javalib/dtd/ent/iso-grk4.ent, + tools/gjdoc/javalib/dtd/ent/iso-lat1.ent, + tools/gjdoc/javalib/dtd/ent/iso-lat2.ent, + tools/gjdoc/javalib/dtd/ent/iso-num.ent, + tools/gjdoc/javalib/dtd/ent/iso-pub.ent, + tools/gjdoc/javalib/dtd/ent/iso-tech.ent, + tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java, + tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java, + tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java, + tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java, + tools/gjdoc/javalib/gnu/classpath/tools/doclets/xmldoclet/Driver.java, + tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/Main.java, + tools/gjdoc/javalib/gnu/classpath/tools/java2xhtml/Java2xhtml.java, + tools/gjdoc/javalib/htmldoclet/HtmlDoclet.properties, + tools/gjdoc/javalib/htmldoclet/gjdoc.js, + tools/gjdoc/javalib/htmldoclet/gjdochtml-clean-color1.css, + tools/gjdoc/javalib/htmldoclet/gjdochtml-clean-layout.css, + tools/gjdoc/javalib/htmldoclet/help.xhtml: + Resynced with gjdoc. + + 2005-02-07 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: make + links to classes on index page work correctly. + + 2005-02-06 Julian Scheid <[EMAIL PROTECTED]> + + * src/resources/htmldoclet/gjdochtml-clean-layout.css: fix + navigation bar wrapping problem. + + 2005-02-06 Julian Scheid <[EMAIL PROTECTED]> + + * README: replaced usage with latest output. + + * src/gnu/classpath/tools/gjdoc/Main.java: add -s and + -addstylesheet to usage. Reword `path of' in usage to `path to'. + + 2005-02-06 Julian Scheid <[EMAIL PROTECTED]> + + * README: replaced usage with latest output; added -nocomment and + -serialwarn to Missing Features and adjusted wording re: command + line compatibility. + + * src/gnu/classpath/tools/doclets/AbstractDoclet.java: accept `-s' + as an alias for `-sourcepath'. + + * src/gnu/classpath/tools/gjdoc/Main.java: accept `-s' as an alias + for `-sourcepath'; accept `--help' as an alias for `-help'. add + option '-all'; rearrange usage; remove + [ignored] from usage for option -locale; fix typos in usage; + + * src/gnu/classpath/tools/java2xhtml/Java2xhtml.java: factor out + CSS class names; rename CSS classes for brevity. + + * src/resources/htmldoclet/gjdochtml-clean-color1.css: CSS class + name refactoring. + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: add + option -addstylesheet; fix option -stylesheetfile; + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java: have + beginPage() accept a list of stylesheets. + + 2005-02-05 Mark Wielaard <[EMAIL PROTECTED]> + + * README: Add last two lines of usage message. + + 2005-02-05 Julian Scheid <[EMAIL PROTECTED]> + + * README: + * TROUBLESHOOTING: + * src/gnu/classpath/tools/gjdoc/Main.java: + applied documentation update patch by Mark Wielaard. + + 2005-02-05 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: + fixed bottom navigation bar on use pages. + + 2005-02-05 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/xmldoclet/Driver.java: make + -xmlonly the default mode. + + 2005-02-05 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/AbstractDoclet.java: collect + "implemented by" usage information for interfaces. + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: add + "implemented by" information and summary description to use pages. + + * src/gnu/classpath/tools/doclets/htmldoclet/CssClass.java: add + new classes for use pages. + + * src/resources/htmldoclet/HtmlDoclet.properties: add text for + "implemented by" usage category. + + * src/resources/htmldoclet/gjdochtml-clean-layout.css: add layout + for usage summary description. + + 2005-02-05 Julian Scheid <[EMAIL PROTECTED]> + + * ChangeLog: correction. + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: fix + typo in output. + + 2005-02-05 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: more + information for uses pages; fixed bugs in navigation bar; add + decoration for source code page; link to next/previous index + letter; add message for empty use pages; several minor + improvements and bugfixes. + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java: add + method getFile(). + + * src/gnu/classpath/tools/doclets/htmldoclet/CssClass.java: add + new CSS styles. + + * src/gnu/classpath/tools/java2xhtml/Java2xhtml.java: better tag + nesting for line anchor. + + * src/resources/htmldoclet/gjdochtml-clean-layout.css: + * src/resources/htmldoclet/gjdochtml-clean-color1.css: + improved stylesheets. + + 2005-02-04 Julian Scheid <[EMAIL PROTECTED]> + + * configure.ac: bump version to 0.7.1. + + * README: update to reflect changes since previous release. + + * Makefile.am: generate version.properties at compile-time and add + to jars and native executable. + + * src/gnu/classpath/tools/gjdoc/Main.java: use version string from + generated /version.properties. + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: add + message to deprecated page if there are no deprecated API + elements; make space between parameter type and parameter name + non-breaking; add meta-equiv keywords to class and package pages; + fix bug on deprecated page; add next/prev links and shortcuts to + navigation bar; improve formatting of method/constructor synopsis + in detail section; add "throws" information to method/constructor + synopsisl; use version string from /version.properties; remove + help page from output for now. + + * src/gnu/classpath/tools/doclets/AbstractDoclet.java: move + getDocletVersion() to HtmlDoclet.java. + + * src/gnu/classpath/tools/doclets/htmldoclet/CssClass.java: add + new CSS classes; change tag for detail synopsis to "pre". + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java: + support keyword output. + + * src/resources/htmldoclet/gjdochtml-clean-layout.css: some + polishing. + + * src/resources/htmldoclet/help.xhtml: friendlier "no help + available" message. + + * src/resources/htmldoclet/gjdoc.js: remove stylesheet-related + hacks for now. + + 2005-02-03 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/gjdoc/Main.java: recognize option + -bootclasspath; output warning if -bootclasspath is specified. + + 2005-02-03 Andrew Overholt <[EMAIL PROTECTED]> + + * Makefile.am: Add java-expression.g to EXTRA_DIST. Add fixes for + distcheck. Add necessary include to AM_GCJFLAGS for the + antlr-generated files. + + 2005-02-03 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/gjdoc/Main.java: add support for option + --version. + + 2005-02-02 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java + (printPackageTreeRec): add parameter parentNode; don't output tree + parent in package interface tree implements list; prefix + implements list with "also implements:" for interfaces; remove + bogus whitespace in output. + (printClassTree, printInterfaceTree): pass parameter parentNode. + + 2005-02-02 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/gjdoc/Main.java (getCollator): + gracefully handle null return values from + Collator.getCollator(Locale); add documentation. + + 2005-02-01 Andrew Overholt <[EMAIL PROTECTED]> + + * configure.ac: Add --enable-xmldoclet option (default to no). + + * Makefile.am: Add required logic for above. Minor tweaks for antlr. + + 2005-01-14 Julian Scheid <[EMAIL PROTECTED]> + + * src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: + add missing table row tags and table end tag on usage page. + +2005-02-07 Dalibor Topic <[EMAIL PROTECTED]> + * libraries/clib/native/Method.c (Java_java_lang_reflect_Method_invoke0) Use a jmethodID when invoking JNI functions instead of Method *. Fixes Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.199 kaffe/Makefile.in:1.200 --- kaffe/Makefile.in:1.199 Sat Feb 5 17:45:59 2005 +++ kaffe/Makefile.in Mon Feb 7 15:46:46 2005 @@ -65,10 +65,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_antlr.m4 \ - $(top_srcdir)/m4/ac_prog_java.m4 \ - $(top_srcdir)/m4/ac_prog_java_works.m4 \ - $(top_srcdir)/m4/ac_prog_javac.m4 \ - $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \ @@ -122,7 +118,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -ANTLR = @ANTLR@ ANTLR_JAR = @ANTLR_JAR@ AR = @AR@ AS = @AS@ @@ -224,8 +219,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ JASMIN = @JASMIN@ -JAVA = @JAVA@ -JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ @@ -390,7 +383,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ toolslibdir = @toolslibdir@ -uudecode = @uudecode@ with_engine = @with_engine@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.3e Index: kaffe/aclocal.m4 diff -u kaffe/aclocal.m4:1.119 kaffe/aclocal.m4:1.120 --- kaffe/aclocal.m4:1.119 Thu Jan 27 01:07:24 2005 +++ kaffe/aclocal.m4 Mon Feb 7 15:46:46 2005 @@ -1127,10 +1127,6 @@ m4_include([m4/ac_c_bigendian_cross.m4]) m4_include([m4/ac_prog_antlr.m4]) -m4_include([m4/ac_prog_java.m4]) -m4_include([m4/ac_prog_java_works.m4]) -m4_include([m4/ac_prog_javac.m4]) -m4_include([m4/ac_prog_javac_works.m4]) m4_include([m4/acx_pthread.m4]) m4_include([m4/alsa.m4]) m4_include([m4/ax_cflags_gcc_option.m4]) Index: kaffe/configure diff -u kaffe/configure:1.419 kaffe/configure:1.420 --- kaffe/configure:1.419 Sun Feb 6 10:09:49 2005 +++ kaffe/configure Mon Feb 7 15:46:48 2005 @@ -491,7 +491,7 @@ ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm" ac_subdirs_all="$ac_subdirs_all libltdl" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE PKG_CONFIG GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE JAVA uudecode JAVAC ANTLR ANTLR_JAR COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS COND_CLASSPATH_GTK_AWT_TRUE COND_CLASSPATH_GTK_AWT_FALSE PKG_CONFIG GTK_CFLAGS GTK_LIBS CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE XML2_CONFIG XML_CFLAGS XML_LIBS XSLT_CONFIG XSLT_CFLAGS XSLT_LIBS COND_LIBXMLJ_TRUE COND_LIBXMLJ_FALSE ANTLR_JAR COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS BINRELOC_CFLAGS ENABLE_BINRELOC_TRUE ENABLE_BINRELOC_FALSE KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG LTLIBOBJS' ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag' # Initialize some variables set by options. @@ -58317,389 +58317,19 @@ if test x"$enable_gjdoc" = x"yes" ; then -if test x$JAVAPREFIX = x; then - test x$JAVA = x && for ac_prog in kaffe$EXEEXT java$EXEEXT -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_JAVA+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$JAVA"; then - ac_cv_prog_JAVA="$JAVA" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_JAVA="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -JAVA=$ac_cv_prog_JAVA -if test -n "$JAVA"; then - echo "$as_me:$LINENO: result: $JAVA" >&5 -echo "${ECHO_T}$JAVA" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$JAVA" && break -done - -else - test x$JAVA = x && for ac_prog in kaffe$EXEEXT java$EXEEXT -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_JAVA+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$JAVA"; then - ac_cv_prog_JAVA="$JAVA" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_JAVA="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -JAVA=$ac_cv_prog_JAVA -if test -n "$JAVA"; then - echo "$as_me:$LINENO: result: $JAVA" >&5 -echo "${ECHO_T}$JAVA" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$JAVA" && break -done -test -n "$JAVA" || JAVA="$JAVAPREFIX" - -fi -test x$JAVA = x && { { echo "$as_me:$LINENO: error: no acceptable Java virtual machine found in \$PATH" >&5 -echo "$as_me: error: no acceptable Java virtual machine found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - -# Extract the first word of "uudecode$EXEEXT", so it can be a program name with args. -set dummy uudecode$EXEEXT; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_uudecode+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$uudecode"; then - ac_cv_prog_uudecode="$uudecode" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_uudecode="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -uudecode=$ac_cv_prog_uudecode -if test -n "$uudecode"; then - echo "$as_me:$LINENO: result: $uudecode" >&5 -echo "${ECHO_T}$uudecode" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test x$uudecode = xyes; then -echo "$as_me:$LINENO: checking if uudecode can decode base 64 file" >&5 -echo $ECHO_N "checking if uudecode can decode base 64 file... $ECHO_C" >&6 -if test "${ac_cv_prog_uudecode_base64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cat << \EOF > Test.uue -begin-base64 644 Test.class -yv66vgADAC0AFQcAAgEABFRlc3QHAAQBABBqYXZhL2xhbmcvT2JqZWN0AQAE -bWFpbgEAFihbTGphdmEvbGFuZy9TdHJpbmc7KVYBAARDb2RlAQAPTGluZU51 -bWJlclRhYmxlDAAKAAsBAARleGl0AQAEKEkpVgoADQAJBwAOAQAQamF2YS9s -YW5nL1N5c3RlbQEABjxpbml0PgEAAygpVgwADwAQCgADABEBAApTb3VyY2VG -aWxlAQAJVGVzdC5qYXZhACEAAQADAAAAAAACAAkABQAGAAEABwAAACEAAQAB -AAAABQO4AAyxAAAAAQAIAAAACgACAAAACgAEAAsAAQAPABAAAQAHAAAAIQAB -AAEAAAAFKrcAErEAAAABAAgAAAAKAAIAAAAEAAQABAABABMAAAACABQ= -==== -EOF -if uudecode$EXEEXT Test.uue; then - ac_cv_prog_uudecode_base64=yes -else - echo "configure: 58464: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 - echo "configure: failed file was:" >&5 - cat Test.uue >&5 - ac_cv_prog_uudecode_base64=no -fi -rm -f Test.uue -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_uudecode_base64" >&5 -echo "${ECHO_T}$ac_cv_prog_uudecode_base64" >&6 -fi -if test x$ac_cv_prog_uudecode_base64 != xyes; then - rm -f Test.class - { echo "$as_me:$LINENO: WARNING: I have to compile Test.class from scratch" >&5 -echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} - if test x$ac_cv_prog_javac_works = xno; then - { { echo "$as_me:$LINENO: error: Cannot compile java source. $JAVAC does not work properly" >&5 -echo "$as_me: error: Cannot compile java source. $JAVAC does not work properly" >&2;} - { (exit 1); exit 1; }; } - fi - if test x$ac_cv_prog_javac_works = x; then - -if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && for ac_prog in "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_JAVAC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$JAVAC"; then - ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_JAVAC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -JAVAC=$ac_cv_prog_JAVAC -if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$JAVAC" && break -done - -else - test "x$JAVAC" = x && for ac_prog in "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_JAVAC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$JAVAC"; then - ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_JAVAC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -JAVAC=$ac_cv_prog_JAVAC -if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$JAVAC" && break -done -test -n "$JAVAC" || JAVAC="$JAVAPREFIX" - -fi -test "x$JAVAC" = x && { { echo "$as_me:$LINENO: error: no acceptable Java compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable Java compiler found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking if $JAVAC works" >&5 -echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6 -if test "${ac_cv_prog_javac_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -JAVA_TEST=Test.java -CLASS_TEST=Test.class -cat << \EOF > $JAVA_TEST -/* #line 58582 "configure" */ -public class Test { -} -EOF -if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null 2>&1; then - ac_cv_prog_javac_works=yes -else - { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5 -echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;} - { (exit 1); exit 1; }; } - echo "configure: failed program was:" >&5 - cat $JAVA_TEST >&5 -fi -rm -f $JAVA_TEST $CLASS_TEST - -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5 -echo "${ECHO_T}$ac_cv_prog_javac_works" >&6 - - - fi -fi -echo "$as_me:$LINENO: checking if $JAVA works" >&5 -echo $ECHO_N "checking if $JAVA works... $ECHO_C" >&6 -if test "${ac_cv_prog_java_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -JAVA_TEST=Test.java -CLASS_TEST=Test.class -TEST=Test -cat << \EOF > $JAVA_TEST -/* [#]line 58619 "configure" */ -public class Test { -public static void main (String args[]) { - System.exit (0); -} } -EOF -if test x$ac_cv_prog_uudecode_base64 != xyes; then - if { ac_try='$JAVAC $JAVACFLAGS $JAVA_TEST' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s $CLASS_TEST; then - : - else - echo "configure: failed program was:" >&5 - cat $JAVA_TEST >&5 - { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5 -echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;} - { (exit 1); exit 1; }; } - fi -fi -if { ac_try='$JAVA $JAVAFLAGS $TEST' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null 2>&1; then - ac_cv_prog_java_works=yes -else - echo "configure: failed program was:" >&5 - cat $JAVA_TEST >&5 - { { echo "$as_me:$LINENO: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&5 -echo "$as_me: error: The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" >&2;} - { (exit 1); exit 1; }; } -fi -rm -fr $JAVA_TEST $CLASS_TEST Test.uue - -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_java_works" >&5 -echo "${ECHO_T}$ac_cv_prog_java_works" >&6 - - - - - echo "$as_me:$LINENO: checking for antlr 2.7.1 or better" >&5 + echo "$as_me:$LINENO: checking for antlr 2.7.1 or better" >&5 echo $ECHO_N "checking for antlr 2.7.1 or better... $ECHO_C" >&6 for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` /usr/share/java; do - CLASSPATH="" - BOOTCLASSPATH="" - antlr_version_str=`$JAVA -classpath "$antlr_lib_home/antlr.jar" antlr.Tool 2>&1 | head -n 1 | sed '/.*Version */!d; s///;q'` - if test "$antlr_version_str"; then - antlr_version_regex='s/\([[:digit:]]\+\)\.\([[:digit:]]\+\)\.\([[:digit:]]\+\).*$/' - antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` - antlr_version_minor=`echo $antlr_version_str | sed "$antlr_version_regex\\2/"` - antlr_version_micro=`echo $antlr_version_str | sed "$antlr_version_regex\\3/"` - (test $antlr_version_major -gt 2 || - (test $antlr_version_major -eq 2 && \ - test $antlr_version_minor -gt 7) || \ - (test $antlr_version_major -eq 2 && \ - test $antlr_version_minor -eq 7 && \ - test $antlr_version_micro -ge 1)) && \ - - (test -z $ANTLR_JAR || \ - (test $antlr_version_major -gt $antlr_use_major || - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -gt $antlr_use_minor) || \ - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -eq $antlr_use_minor && \ - test $antlr_version_micro -ge $antlr_use_micro))) && \ - ANTLR_JAR=$antlr_lib_home/antlr.jar && \ - antlr_use_major=$antlr_version_major && \ - antlr_use_minor=$antlr_version_minor && \ - antlr_use_micro=$antlr_version_micro + if test -z $ANTLR_JAR; then + ANTLR_JAR=$antlr_lib_home/antlr.jar fi done - ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool" test -z $ANTLR_JAR && \ { { echo "$as_me:$LINENO: error: no suitable antlr.jar found for version 2.7.1" >&5 echo "$as_me: error: no suitable antlr.jar found for version 2.7.1" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:$LINENO: result: $antlr_use_major.$antlr_use_minor.$antlr_use_micro" >&5 -echo "${ECHO_T}$antlr_use_major.$antlr_use_minor.$antlr_use_micro" >&6 - + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi @@ -60794,10 +60424,6 @@ s,@XSLT_LIBS@,$XSLT_LIBS,;t t s,@COND_LIBXMLJ_TRUE@,$COND_LIBXMLJ_TRUE,;t t s,@COND_LIBXMLJ_FALSE@,$COND_LIBXMLJ_FALSE,;t t -s,@JAVA@,$JAVA,;t t -s,@uudecode@,$uudecode,;t t -s,@JAVAC@,$JAVAC,;t t -s,@ANTLR@,$ANTLR,;t t s,@ANTLR_JAR@,$ANTLR_JAR,;t t s,@COND_GJDOC_TRUE@,$COND_GJDOC_TRUE,;t t s,@COND_GJDOC_FALSE@,$COND_GJDOC_FALSE,;t t Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.170 kaffe/config/Makefile.in:1.171 --- kaffe/config/Makefile.in:1.170 Sat Feb 5 17:46:23 2005 +++ kaffe/config/Makefile.in Mon Feb 7 15:46:56 2005 @@ -53,10 +53,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_antlr.m4 \ - $(top_srcdir)/m4/ac_prog_java.m4 \ - $(top_srcdir)/m4/ac_prog_java_works.m4 \ - $(top_srcdir)/m4/ac_prog_javac.m4 \ - $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \ @@ -91,7 +87,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -ANTLR = @ANTLR@ ANTLR_JAR = @ANTLR_JAR@ AR = @AR@ AS = @AS@ @@ -193,8 +188,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ JASMIN = @JASMIN@ -JAVA = @JAVA@ -JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ @@ -359,7 +352,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ toolslibdir = @toolslibdir@ -uudecode = @uudecode@ with_engine = @with_engine@ @[EMAIL PROTECTED] = @[EMAIL PROTECTED] = jit-md.h Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.212 kaffe/include/Makefile.in:1.213 --- kaffe/include/Makefile.in:1.212 Sun Feb 6 18:45:43 2005 +++ kaffe/include/Makefile.in Mon Feb 7 15:46:56 2005 @@ -55,10 +55,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_antlr.m4 \ - $(top_srcdir)/m4/ac_prog_java.m4 \ - $(top_srcdir)/m4/ac_prog_java_works.m4 \ - $(top_srcdir)/m4/ac_prog_javac.m4 \ - $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \ @@ -107,7 +103,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -ANTLR = @ANTLR@ ANTLR_JAR = @ANTLR_JAR@ AR = @AR@ AS = @AS@ @@ -209,8 +204,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ JASMIN = @JASMIN@ -JAVA = @JAVA@ -JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ @@ -375,7 +368,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ toolslibdir = @toolslibdir@ -uudecode = @uudecode@ with_engine = @with_engine@ KLASSES_JAR = $(top_builddir)/libraries/javalib/rt.jar EXTRA_DIST = distclean-hack \ Index: kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/Makefile.in:1.140 kaffe/kaffe/Makefile.in:1.141 --- kaffe/kaffe/Makefile.in:1.140 Sat Feb 5 17:46:28 2005 +++ kaffe/kaffe/Makefile.in Mon Feb 7 15:46:58 2005 @@ -48,10 +48,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_antlr.m4 \ - $(top_srcdir)/m4/ac_prog_java.m4 \ - $(top_srcdir)/m4/ac_prog_java_works.m4 \ - $(top_srcdir)/m4/ac_prog_javac.m4 \ - $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \ @@ -93,7 +89,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -ANTLR = @ANTLR@ ANTLR_JAR = @ANTLR_JAR@ AR = @AR@ AS = @AS@ @@ -195,8 +190,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ JASMIN = @JASMIN@ -JAVA = @JAVA@ -JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ @@ -361,7 +354,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ toolslibdir = @toolslibdir@ -uudecode = @uudecode@ with_engine = @with_engine@ @[EMAIL PROTECTED] = xprof @[EMAIL PROTECTED] = jvmpi Index: kaffe/kaffe/jvmpi/Makefile.in diff -u kaffe/kaffe/jvmpi/Makefile.in:1.62 kaffe/kaffe/jvmpi/Makefile.in:1.63 --- kaffe/kaffe/jvmpi/Makefile.in:1.62 Sat Feb 5 17:46:31 2005 +++ kaffe/kaffe/jvmpi/Makefile.in Mon Feb 7 15:46:58 2005 @@ -43,10 +43,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_antlr.m4 \ - $(top_srcdir)/m4/ac_prog_java.m4 \ - $(top_srcdir)/m4/ac_prog_java_works.m4 \ - $(top_srcdir)/m4/ac_prog_javac.m4 \ - $(top_srcdir)/m4/ac_prog_javac_works.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \ @@ -105,7 +101,6 @@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -ANTLR = @ANTLR@ ANTLR_JAR = @ANTLR_JAR@ AR = @AR@ AS = @AS@ @@ -207,8 +202,6 @@ *** Patch too long, truncated *** _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe