CVS kaffe (robilad): add support for external gjdoc
Kaffe CVS <[email protected]>
| Newsgroups | gmane.comp.java.vm.kaffe.general |
|---|---|
| Message-ID | <[email protected]> |
PatchSet 7616 Date: 2007/12/22 23:05:26 Author: robilad Branch: HEAD Tag: (none) Log: add support for external gjdoc 2007-12-22 Dalibor Topic <[email protected]> * m4/ac_prog_javadoc.m4: New file from ac-archive.sf.net. Adapted to check for gjdoc, too, and to print a warning if no javadoc tool can be found. Use AC_PATH_PROGS instead of AC_CHECK_PROGS so that kaffe's javadoc can be symlinked to it. * configure.ac: If --enable-gjdoc is not passed to configure, use AC_PROG_JAVADOC to find a suitable tool. * kaffe/scripts/Makefile.am (install-exec-local, uninstall-local): Symlink javadoc if gjdoc build is not enabled. Members: ChangeLog:1.5114->1.5115 Makefile.in:1.287->1.288 aclocal.m4:1.136->1.137 configure:1.606->1.607 configure.ac:1.276->1.277 config/Makefile.in:1.242->1.243 include/Makefile.in:1.304->1.305 kaffe/Makefile.in:1.192->1.193 kaffe/jvmpi/Makefile.in:1.117->1.118 kaffe/kaffe/Makefile.in:1.216->1.217 kaffe/kaffeh/Makefile.in:1.197->1.198 kaffe/kaffevm/Makefile.in:1.266->1.267 kaffe/kaffevm/boehm-gc/Makefile.in:1.80->1.81 kaffe/kaffevm/gcj/Makefile.in:1.172->1.173 kaffe/kaffevm/intrp/Makefile.in:1.181->1.182 kaffe/kaffevm/jit/Makefile.in:1.191->1.192 kaffe/kaffevm/jit3/Makefile.in:1.161->1.162 kaffe/kaffevm/jni/Makefile.in:1.85->1.86 kaffe/kaffevm/kaffe-gc/Makefile.in:1.79->1.80 kaffe/kaffevm/systems/Makefile.in:1.181->1.182 kaffe/kaffevm/systems/beos-native/Makefile.in:1.172->1.173 kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.36->1.37 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.178->1.179 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.182->1.183 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.158->1.159 kaffe/kaffevm/verifier/Makefile.in:1.84->1.85 kaffe/man/Makefile.in:1.179->1.180 kaffe/scripts/Makefile.am:1.19->1.20 kaffe/scripts/Makefile.in:1.222->1.223 kaffe/scripts/bat/Makefile.in:1.172->1.173 kaffe/scripts/compat/Makefile.in:1.200->1.201 kaffe/xprof/Makefile.in:1.147->1.148 libltdl/acinclude.m4:1.47->1.48 libltdl/config.guess:1.23->1.24 libltdl/config.sub:1.28->1.29 libltdl/configure:1.109->1.110 libltdl/ltdl.c:1.58->1.59 libltdl/ltmain.sh:1.26->1.27 libraries/Makefile.in:1.175->1.176 libraries/clib/Makefile.in:1.196->1.197 libraries/clib/awt/Makefile.in:1.190->1.191 libraries/clib/awt/X/Makefile.in:1.185->1.186 libraries/clib/awt/nano-X/Makefile.in:1.57->1.58 libraries/clib/awt/qt/Makefile.in:1.138->1.139 libraries/clib/awt/xynth/Makefile.in:1.13->1.14 libraries/clib/management/Makefile.in:1.194->1.195 libraries/clib/math/Makefile.in:1.188->1.189 libraries/clib/security/Makefile.in:1.160->1.161 libraries/clib/sound/Makefile.in:1.84->1.85 libraries/clib/sound/alsa/Makefile.in:1.85->1.86 libraries/clib/sound/common/Makefile.in:1.84->1.85 libraries/clib/sound/esd/Makefile.in:1.85->1.86 libraries/clib/zip/Makefile.in:1.193->1.194 libraries/javalib/Makefile.in:1.585->1.586 libraries/javalib/awt-implementations/Makefile.in:1.69->1.70 libraries/javalib/awt-implementations/kaffe/Makefile.in:1.89->1.90 libraries/javalib/dnsjava/Makefile.in:1.15->1.16 libraries/javalib/gmp-math/Makefile.in:1.78->1.79 libraries/javalib/gnu-inet/Makefile.in:1.12->1.13 libraries/javalib/tritonus-sound/Makefile.in:1.15->1.16 libraries/javalib/vmspecific/Makefile.in:1.19->1.20 libraries/javalib/zlib-zip/Makefile.in:1.15->1.16 m4/ac_prog_javadoc.m4:INITIAL->1.1 m4/libtool.m4:1.24->1.25 replace/Makefile.in:1.134->1.135 scripts/config.guess:1.22->1.23 scripts/config.sub:1.22->1.23 scripts/ltmain.sh:1.47->1.48 test/Makefile.in:1.184->1.185 test/internal/Makefile.in:1.160->1.161 test/jni/Makefile.in:1.90->1.91 test/regression/Makefile.in:1.262->1.263 test/regression/compile_time/Makefile.in:1.112->1.113 test/regression/compiler/Makefile.in:1.96->1.97 test/regression/run_time/Makefile.in:1.111->1.112 tools/Makefile.in:1.87->1.88 tools/gjdoc/Makefile.in:1.85->1.86 tools/gjdoc/javalib/Makefile.in:1.103->1.104 tools/javatools/Makefile.in:1.44->1.45 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5114 kaffe/ChangeLog:1.5115 --- kaffe/ChangeLog:1.5114 Sat Dec 22 08:30:44 2007 +++ kaffe/ChangeLog Sat Dec 22 23:05:26 2007 @@ -1,4 +1,17 @@ -2007-12-22 Dalibor Topic <[email protected]> +2007-12-22 Dalibor Topic <[email protected]> + + * m4/ac_prog_javadoc.m4: New file from ac-archive.sf.net. Adapted to check + for gjdoc, too, and to print a warning if no javadoc tool can be found. Use + AC_PATH_PROGS instead of AC_CHECK_PROGS so that kaffe's javadoc can be symlinked + to it. + + * configure.ac: If --enable-gjdoc is not passed to configure, use AC_PROG_JAVADOC + to find a suitable tool. + + * kaffe/scripts/Makefile.am (install-exec-local, uninstall-local): Symlink javadoc + if gjdoc build is not enabled. + +2007-12-22 Kiyo Inaba <[email protected]> * README: Fix typo. Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.287 kaffe/Makefile.in:1.288 --- kaffe/Makefile.in:1.287 Sun Dec 9 20:46:49 2007 +++ kaffe/Makefile.in Sat Dec 22 23:05:31 2007 @@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -175,6 +176,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/aclocal.m4 diff -u kaffe/aclocal.m4:1.136 kaffe/aclocal.m4:1.137 --- kaffe/aclocal.m4:1.136 Sun Dec 9 20:46:49 2007 +++ kaffe/aclocal.m4 Sat Dec 22 23:05:31 2007 @@ -959,6 +959,7 @@ m4_include([m4/ac_c_bigendian_cross.m4]) m4_include([m4/ac_prog_javac.m4]) m4_include([m4/ac_prog_javac_works.m4]) +m4_include([m4/ac_prog_javadoc.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.606 kaffe/configure:1.607 --- kaffe/configure:1.606 Thu Dec 20 00:31:45 2007 +++ kaffe/configure Sat Dec 22 23:05:31 2007 @@ -1028,6 +1028,7 @@ MATH_LIB COND_GJDOC_TRUE COND_GJDOC_FALSE +JAVADOC COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS @@ -7015,7 +7016,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -7134,7 +7135,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7137 "configure"' > conftest.$ac_ext + echo '#line 7138 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9698,11 +9699,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9701: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9702: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9705: \$? = $ac_status" >&5 + echo "$as_me:9706: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9988,11 +9989,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9991: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9992: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9995: \$? = $ac_status" >&5 + echo "$as_me:9996: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10092,11 +10093,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10095: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10096: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10099: \$? = $ac_status" >&5 + echo "$as_me:10100: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10356,12 +10357,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs=no else ld_shlibs=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10905,7 +10907,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11616,6 +11618,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12441,7 +12455,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12444 "configure" +#line 12458 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12541,7 +12555,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12544 "configure" +#line 12558 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14151,7 +14165,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -14856,7 +14870,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -14965,11 +14979,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14968: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14982: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14972: \$? = $ac_status" >&5 + echo "$as_me:14986: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15069,11 +15083,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15072: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15086: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15076: \$? = $ac_status" >&5 + echo "$as_me:15090: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15141,6 +15155,9 @@ cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -15586,6 +15603,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -16631,11 +16660,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16634: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16638: \$? = $ac_status" >&5 + echo "$as_me:16667: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16735,11 +16764,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16738: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16767: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16742: \$? = $ac_status" >&5 + echo "$as_me:16771: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16999,12 +17028,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs_F77=no else ld_shlibs_F77=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -17528,7 +17558,7 @@ link_all_deplibs_F77=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -18187,6 +18217,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -18926,11 +18968,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18929: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18971: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18933: \$? = $ac_status" >&5 + echo "$as_me:18975: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19216,11 +19258,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19219: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19261: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19223: \$? = $ac_status" >&5 + echo "$as_me:19265: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19320,11 +19362,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19323: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19365: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19327: \$? = $ac_status" >&5 + echo "$as_me:19369: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19584,12 +19626,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs_GCJ=no else ld_shlibs_GCJ=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -20133,7 +20176,7 @@ link_all_deplibs_GCJ=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -20792,6 +20835,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -26105,7 +26160,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 26108 "configure" */ +/* #line 26163 "configure" */ public class Test { } EOF @@ -46971,6 +47026,107 @@ fi +if test x"$enable_gjdoc" != x"yes" ; then + +if test "x$JAVAPREFIX" = x; then + test "x$JAVADOC" = x && for ac_prog in gjdoc$EXEEXT javadoc$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_path_JAVADOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $JAVADOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +JAVADOC=$ac_cv_path_JAVADOC +if test -n "$JAVADOC"; then + { echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$JAVADOC" && break +done + +else + test "x$JAVADOC" = x && for ac_prog in gjdoc$EXEEXT javadoc +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_path_JAVADOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $JAVADOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +JAVADOC=$ac_cv_path_JAVADOC +if test -n "$JAVADOC"; then + { echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$JAVADOC" && break +done +test -n "$JAVADOC" || JAVADOC="$JAVAPREFIX" + +fi +test "x$JAVADOC" = x && { echo "$as_me:$LINENO: WARNING: no acceptable javadoc generator found in \$PATH" >&5 +echo "$as_me: WARNING: no acceptable javadoc generator found in \$PATH" >&2;} + +fi + # Check whether --enable-classpath-tools was given. if test "${enable_classpath_tools+set}" = set; then @@ -49280,6 +49436,7 @@ MATH_LIB!$MATH_LIB$ac_delim COND_GJDOC_TRUE!$COND_GJDOC_TRUE$ac_delim COND_GJDOC_FALSE!$COND_GJDOC_FALSE$ac_delim +JAVADOC!$JAVADOC$ac_delim COND_CLASSPATH_TOOLS_TRUE!$COND_CLASSPATH_TOOLS_TRUE$ac_delim COND_CLASSPATH_TOOLS_FALSE!$COND_CLASSPATH_TOOLS_FALSE$ac_delim DLOPEN_JAVA_LIBS!$DLOPEN_JAVA_LIBS$ac_delim @@ -49313,7 +49470,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.276 kaffe/configure.ac:1.277 --- kaffe/configure.ac:1.276 Tue Dec 18 23:25:13 2007 +++ kaffe/configure.ac Sat Dec 22 23:05:32 2007 @@ -1958,6 +1958,10 @@ AM_CONDITIONAL([COND_GJDOC], [test x"$enable_gjdoc" = x"yes"]) +if test x"$enable_gjdoc" != x"yes" ; then + AC_PROG_JAVADOC +fi + dnl ========================================================================= dnl Building of classpath tools dnl ------------------------------------------------------------------------- Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.242 kaffe/config/Makefile.in:1.243 --- kaffe/config/Makefile.in:1.242 Sun Dec 9 20:46:52 2007 +++ kaffe/config/Makefile.in Sat Dec 22 23:05:33 2007 @@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -145,6 +146,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.304 kaffe/include/Makefile.in:1.305 --- kaffe/include/Makefile.in:1.304 Sun Dec 9 20:46:53 2007 +++ kaffe/include/Makefile.in Sat Dec 22 23:05:34 2007 @@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -160,6 +161,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/Makefile.in:1.192 kaffe/kaffe/Makefile.in:1.193 --- kaffe/kaffe/Makefile.in:1.192 Sun Dec 9 20:46:53 2007 +++ kaffe/kaffe/Makefile.in Sat Dec 22 23:05:34 2007 @@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -149,6 +150,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/jvmpi/Makefile.in diff -u kaffe/kaffe/jvmpi/Makefile.in:1.117 kaffe/kaffe/jvmpi/Makefile.in:1.118 --- kaffe/kaffe/jvmpi/Makefile.in:1.117 Sun Dec 9 20:46:54 2007 +++ kaffe/kaffe/jvmpi/Makefile.in Sat Dec 22 23:05:35 2007 @@ -38,6 +38,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -160,6 +161,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/kaffe/Makefile.in:1.216 kaffe/kaffe/kaffe/Makefile.in:1.217 --- kaffe/kaffe/kaffe/Makefile.in:1.216 Sun Dec 9 20:46:54 2007 +++ kaffe/kaffe/kaffe/Makefile.in Sat Dec 22 23:05:35 2007 @@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -161,6 +162,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffeh/Makefile.in diff -u kaffe/kaffe/kaffeh/Makefile.in:1.197 kaffe/kaffe/kaffeh/Makefile.in:1.198 --- kaffe/kaffe/kaffeh/Makefile.in:1.197 Sun Dec 9 20:46:55 2007 +++ kaffe/kaffe/kaffeh/Makefile.in Sat Dec 22 23:05:36 2007 @@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -167,6 +168,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/Makefile.in diff -u kaffe/kaffe/kaffevm/Makefile.in:1.266 kaffe/kaffe/kaffevm/Makefile.in:1.267 --- kaffe/kaffe/kaffevm/Makefile.in:1.266 Sun Dec 9 20:46:56 2007 +++ kaffe/kaffe/kaffevm/Makefile.in Sat Dec 22 23:05:36 2007 @@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -223,6 +224,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.80 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.81 --- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.80 Sun Dec 9 20:46:57 2007 +++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Sat Dec 22 23:05:36 2007 @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -166,6 +167,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/gcj/Makefile.in diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.172 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.173 --- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.172 Sun Dec 9 20:46:57 2007 +++ kaffe/kaffe/kaffevm/gcj/Makefile.in Sat Dec 22 23:05:36 2007 @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -166,6 +167,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/intrp/Makefile.in diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.181 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.182 --- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.181 Sun Dec 9 20:46:58 2007 +++ kaffe/kaffe/kaffevm/intrp/Makefile.in Sat Dec 22 23:05:37 2007 @@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -159,6 +160,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/jit/Makefile.in diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.191 kaffe/kaffe/kaffevm/jit/Makefile.in:1.192 --- kaffe/kaffe/kaffevm/jit/Makefile.in:1.191 Sun Dec 9 20:46:58 2007 +++ kaffe/kaffe/kaffevm/jit/Makefile.in Sat Dec 22 23:05:37 2007 @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -167,6 +168,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/jit3/Makefile.in diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.161 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.162 --- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.161 Sun Dec 9 20:46:59 2007 +++ kaffe/kaffe/kaffevm/jit3/Makefile.in Sat Dec 22 23:05:37 2007 @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -167,6 +168,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/jni/Makefile.in diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.85 kaffe/kaffe/kaffevm/jni/Makefile.in:1.86 --- kaffe/kaffe/kaffevm/jni/Makefile.in:1.85 Sun Dec 9 20:46:59 2007 +++ kaffe/kaffe/kaffevm/jni/Makefile.in Sat Dec 22 23:05:37 2007 @@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -163,6 +164,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.79 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.80 --- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.79 Sun Dec 9 20:47:00 2007 +++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Sat Dec 22 23:05:38 2007 @@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -159,6 +160,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/systems/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.181 kaffe/kaffe/kaffevm/systems/Makefile.in:1.182 --- kaffe/kaffe/kaffevm/systems/Makefile.in:1.181 Sun Dec 9 20:47:00 2007 +++ kaffe/kaffe/kaffevm/systems/Makefile.in Sat Dec 22 23:05:38 2007 @@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -148,6 +149,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.172 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.173 --- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.172 Sun Dec 9 20:47:00 2007 +++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Sat Dec 22 23:05:39 2007 @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ @@ -158,6 +159,7 @@ JASMIN = @JASMIN@ JAVAC = @JAVAC@ JAVAC_FLAGS = @JAVAC_FLAGS@ +JAVADOC = @JAVADOC@ JAVA_LIBS = @JAVA_LIBS@ KAFFEH = @KAFFEH@ KAFFE_ARCHOS = @KAFFE_ARCHOS@ Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.36 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.37 --- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.36 Sun Dec 9 20:47:02 2007 +++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in Sat Dec 22 23:05:39 2007 @@ -41,6 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/ac_prog_javac.m4 \ $(top_srcdir)/m4/ac_prog_javac_works.m4 \ + $(top_srcdir)/m4/ac_prog_javadoc.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ *** Patch too long, truncated ***