[kaffe] CVS kaffe (robilad): Added option to turn off building of classpath tools

Kaffe CVS cvs-commits at kaffe.org
Sun Dec 25 10:35:48 PST 2005


PatchSet 7052 
Date: 2005/12/25 18:10:01
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Added option to turn off building of classpath tools

2005-12-25  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: (--disable-classpath-tools) Added switch to disable
        building of classpath tools. Now it should be possible to build kaffe
        on a system without invoking jikes at all by using
         --with-glibj-zip=some-prebuilt-zip --enable-pure-java-math --disable-classpath-tools

        * tools/Makefile.am (MAYBE_CLASSPATH_TOOLS): Added.
        (SUBDIRS) Only recurse into javatools if selected by configure.

Members: 
	ChangeLog:1.4570->1.4571 
	Makefile.in:1.236->1.237 
	configure:1.518->1.519 
	configure.ac:1.196->1.197 
	config/Makefile.in:1.201->1.202 
	include/Makefile.in:1.263->1.264 
	kaffe/Makefile.in:1.161->1.162 
	kaffe/jvmpi/Makefile.in:1.85->1.86 
	kaffe/kaffe/Makefile.in:1.183->1.184 
	kaffe/kaffeh/Makefile.in:1.163->1.164 
	kaffe/kaffevm/Makefile.in:1.215->1.216 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.48->1.49 
	kaffe/kaffevm/gcj/Makefile.in:1.141->1.142 
	kaffe/kaffevm/intrp/Makefile.in:1.150->1.151 
	kaffe/kaffevm/jit/Makefile.in:1.160->1.161 
	kaffe/kaffevm/jit3/Makefile.in:1.130->1.131 
	kaffe/kaffevm/jni/Makefile.in:1.54->1.55 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.47->1.48 
	kaffe/kaffevm/systems/Makefile.in:1.150->1.151 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.141->1.142 
	kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.4->1.5 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.147->1.148 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.151->1.152 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.126->1.127 
	kaffe/kaffevm/verifier/Makefile.in:1.53->1.54 
	kaffe/man/Makefile.in:1.148->1.149 
	kaffe/scripts/Makefile.in:1.188->1.189 
	kaffe/scripts/bat/Makefile.in:1.140->1.141 
	kaffe/scripts/compat/Makefile.in:1.167->1.168 
	kaffe/xprof/Makefile.in:1.116->1.117 
	libltdl/Makefile.in:1.61->1.62 
	libltdl/aclocal.m4:1.59->1.60 
	libltdl/configure:1.97->1.98 
	libraries/Makefile.in:1.144->1.145 
	libraries/clib/Makefile.in:1.160->1.161 
	libraries/clib/awt/Makefile.in:1.159->1.160 
	libraries/clib/awt/X/Makefile.in:1.152->1.153 
	libraries/clib/awt/nano-X/Makefile.in:1.24->1.25 
	libraries/clib/awt/qt/Makefile.in:1.107->1.108 
	libraries/clib/fdlibm/Makefile.in:1.22->1.23 
	libraries/clib/io/Makefile.in:1.157->1.158 
	libraries/clib/management/Makefile.in:1.161->1.162 
	libraries/clib/math/Makefile.in:1.156->1.157 
	libraries/clib/native/Makefile.in:1.202->1.203 
	libraries/clib/net/Makefile.in:1.166->1.167 
	libraries/clib/nio/Makefile.in:1.91->1.92 
	libraries/clib/security/Makefile.in:1.127->1.128 
	libraries/clib/sound/Makefile.in:1.53->1.54 
	libraries/clib/sound/alsa/Makefile.in:1.54->1.55 
	libraries/clib/sound/common/Makefile.in:1.53->1.54 
	libraries/clib/sound/esd/Makefile.in:1.54->1.55 
	libraries/clib/target/Makefile.in:1.13->1.14 
	libraries/clib/target/Linux/Makefile.in:1.13->1.14 
	libraries/clib/target/generic/Makefile.in:1.13->1.14 
	libraries/clib/zip/Makefile.in:1.158->1.159 
	libraries/extensions/Makefile.in:1.136->1.137 
	libraries/extensions/comm/Makefile.in:1.130->1.131 
	libraries/extensions/comm/javalib/Makefile.in:1.131->1.132 
	libraries/extensions/microsoft/Makefile.in:1.122->1.123 
	libraries/extensions/microsoft/clib/Makefile.in:1.126->1.127 
	libraries/extensions/microsoft/javalib/Makefile.in:1.124->1.125 
	libraries/extensions/pjava/Makefile.in:1.130->1.131 
	libraries/extensions/pjava/javalib/Makefile.in:1.131->1.132 
	libraries/extensions/servlet/Makefile.in:1.130->1.131 
	libraries/extensions/servlet/javalib/Makefile.in:1.131->1.132 
	libraries/javalib/Makefile.in:1.515->1.516 
	libraries/javalib/awt-implementations/Makefile.in:1.38->1.39 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.42->1.43 
	libraries/javalib/external/classpath/config.sub:1.12->1.13 
	libraries/javalib/gmp-math/Makefile.in:1.45->1.46 
	replace/Makefile.in:1.103->1.104 
	test/Makefile.in:1.153->1.154 
	test/internal/Makefile.in:1.122->1.123 
	test/jni/Makefile.in:1.56->1.57 
	test/regression/Makefile.in:1.228->1.229 
	test/regression/compile_time/Makefile.in:1.81->1.82 
	test/regression/compiler/Makefile.in:1.65->1.66 
	test/regression/run_time/Makefile.in:1.80->1.81 
	tools/Makefile.am:1.3->1.4 
	tools/Makefile.in:1.55->1.56 
	tools/gjdoc/Makefile.in:1.54->1.55 
	tools/gjdoc/javalib/Makefile.in:1.70->1.71 
	tools/javatools/Makefile.in:1.8->1.9 
	tools/javatools/javalib/Makefile.in:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4570 kaffe/ChangeLog:1.4571
--- kaffe/ChangeLog:1.4570	Sun Dec 25 16:09:43 2005
+++ kaffe/ChangeLog	Sun Dec 25 18:10:01 2005
@@ -1,3 +1,13 @@
+2005-12-25  Dalibor Topic  <robilad at kaffe.org>
+
+	* configure.ac: (--disable-classpath-tools) Added switch to disable 
+	building of classpath tools. Now it should be possible to build kaffe
+	on a system without invoking jikes at all by using
+	 --with-glibj-zip=some-prebuilt-zip --enable-pure-java-math --disable-classpath-tools
+
+	* tools/Makefile.am (MAYBE_CLASSPATH_TOOLS): Added.
+	(SUBDIRS) Only recurse into javatools if selected by configure.
+
 2005-12-25  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* config/mips/atomic.h: Imported from GNU LibC CVS.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.236 kaffe/Makefile.in:1.237
--- kaffe/Makefile.in:1.236	Sun Dec 18 17:35:31 2005
+++ kaffe/Makefile.in	Sun Dec 25 18:10:06 2005
@@ -133,6 +133,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/configure
diff -u kaffe/configure:1.518 kaffe/configure:1.519
--- kaffe/configure:1.518	Tue Dec 20 16:28:29 2005
+++ kaffe/configure	Sun Dec 25 18:10:06 2005
@@ -492,7 +492,7 @@
 ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
 ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
 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 CCAS CCASFLAGS 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 JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JAVAC_TRUE HAVE_JAVAC_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 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 XI18N_CFLAGS 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 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 COND_GJDOC_TRUE COND_GJDOC_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES 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 CCAS CCASFLAGS 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 JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JAVAC_TRUE HAVE_JAVAC_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 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 XI18N_CFLAGS 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 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 COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
 ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
 
 # Initialize some variables set by options.
@@ -1104,6 +1104,9 @@
   --enable-pure-java-math Enable pure java java.math.* package
                           [default=native]
   --enable-gjdoc          Enable building of gjdoc
+  --disable-classpath-tools
+                          Disable building of classpath tools like javap and
+                          rmic
   --enable-classpath-load-library
                           enable to use JNI native methods default=yes
   --disable-direct-threading
@@ -5978,7 +5981,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5981 "configure"' > conftest.$ac_ext
+  echo '#line 5984 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7355,7 +7358,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:7358:" \
+echo "$as_me:7361:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8422,11 +8425,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:8425: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8428: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8429: \$? = $ac_status" >&5
+   echo "$as_me:8432: \$? = $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.
@@ -8690,11 +8693,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:8693: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8696: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8697: \$? = $ac_status" >&5
+   echo "$as_me:8700: \$? = $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.
@@ -8794,11 +8797,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:8797: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8800: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8801: \$? = $ac_status" >&5
+   echo "$as_me:8804: \$? = $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
@@ -11139,7 +11142,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11142 "configure"
+#line 11145 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11239,7 +11242,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11242 "configure"
+#line 11245 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13583,11 +13586,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:13586: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13589: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13590: \$? = $ac_status" >&5
+   echo "$as_me:13593: \$? = $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.
@@ -13687,11 +13690,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:13690: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13693: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13694: \$? = $ac_status" >&5
+   echo "$as_me:13697: \$? = $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
@@ -15257,11 +15260,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:15260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15264: \$? = $ac_status" >&5
+   echo "$as_me:15267: \$? = $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.
@@ -15361,11 +15364,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:15364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15367: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15368: \$? = $ac_status" >&5
+   echo "$as_me:15371: \$? = $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
@@ -17568,11 +17571,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:17571: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17574: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17575: \$? = $ac_status" >&5
+   echo "$as_me:17578: \$? = $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.
@@ -17836,11 +17839,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:17839: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17842: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17843: \$? = $ac_status" >&5
+   echo "$as_me:17846: \$? = $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.
@@ -17940,11 +17943,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:17943: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17946: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17947: \$? = $ac_status" >&5
+   echo "$as_me:17950: \$? = $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
@@ -48712,6 +48715,26 @@
 fi
 
 
+
+# Check whether --enable-classpath-tools or --disable-classpath-tools was given.
+if test "${enable_classpath_tools+set}" = set; then
+  enableval="$enable_classpath_tools"
+
+else
+  enable_classpath_tools=yes
+fi;
+
+
+
+if test x"$enable_classpath_tools" = x"yes"; then
+  COND_CLASSPATH_TOOLS_TRUE=
+  COND_CLASSPATH_TOOLS_FALSE='#'
+else
+  COND_CLASSPATH_TOOLS_TRUE='#'
+  COND_CLASSPATH_TOOLS_FALSE=
+fi
+
+
 JAVA_LIBS=" \
 \$(top_builddir)/libraries/clib/native/libjavalang.la \
 \$(top_builddir)/libraries/clib/net/libjavanet.la \
@@ -50079,6 +50102,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${COND_CLASSPATH_TOOLS_TRUE}" && test -z "${COND_CLASSPATH_TOOLS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"COND_CLASSPATH_TOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_CLASSPATH_TOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${COND_DIRECT_THREADING_TRUE}" && test -z "${COND_DIRECT_THREADING_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"COND_DIRECT_THREADING\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -50948,6 +50978,8 @@
 s, at PROFILE@,$PROFILE,;t t
 s, at COND_GJDOC_TRUE@,$COND_GJDOC_TRUE,;t t
 s, at COND_GJDOC_FALSE@,$COND_GJDOC_FALSE,;t t
+s, at COND_CLASSPATH_TOOLS_TRUE@,$COND_CLASSPATH_TOOLS_TRUE,;t t
+s, at COND_CLASSPATH_TOOLS_FALSE@,$COND_CLASSPATH_TOOLS_FALSE,;t t
 s, at DLOPEN_JAVA_LIBS@,$DLOPEN_JAVA_LIBS,;t t
 s, at OPT_DLOPEN_JAVA_LIBS@,$OPT_DLOPEN_JAVA_LIBS,;t t
 s, at KLIBFLAGS@,$KLIBFLAGS,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.196 kaffe/configure.ac:1.197
--- kaffe/configure.ac:1.196	Tue Dec 20 16:28:36 2005
+++ kaffe/configure.ac	Sun Dec 25 18:10:14 2005
@@ -2106,6 +2106,18 @@
 
 AM_CONDITIONAL([COND_GJDOC], [test x"$enable_gjdoc" = x"yes"])
 
+dnl =========================================================================
+dnl Building of classpath tools
+dnl -------------------------------------------------------------------------
+
+AC_ARG_ENABLE([classpath-tools],
+		AS_HELP_STRING([--disable-classpath-tools],
+				[Disable building of classpath tools like javap and rmic]),
+		[],
+		[enable_classpath_tools=yes])
+
+AM_CONDITIONAL([COND_CLASSPATH_TOOLS], [test x"$enable_classpath_tools" = x"yes"])
+
 JAVA_LIBS=" \
 \$(top_builddir)/libraries/clib/native/libjavalang.la \
 \$(top_builddir)/libraries/clib/net/libjavanet.la \
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.201 kaffe/config/Makefile.in:1.202
--- kaffe/config/Makefile.in:1.201	Sun Dec 18 17:35:38 2005
+++ kaffe/config/Makefile.in	Sun Dec 25 18:10:16 2005
@@ -107,6 +107,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.263 kaffe/include/Makefile.in:1.264
--- kaffe/include/Makefile.in:1.263	Sat Dec 24 05:12:23 2005
+++ kaffe/include/Makefile.in	Sun Dec 25 18:10:17 2005
@@ -122,6 +122,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.161 kaffe/kaffe/Makefile.in:1.162
--- kaffe/kaffe/Makefile.in:1.161	Sun Dec 18 17:35:40 2005
+++ kaffe/kaffe/Makefile.in	Sun Dec 25 18:10:18 2005
@@ -108,6 +108,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.85 kaffe/kaffe/jvmpi/Makefile.in:1.86
--- kaffe/kaffe/jvmpi/Makefile.in:1.85	Sun Dec 18 17:35:41 2005
+++ kaffe/kaffe/jvmpi/Makefile.in	Sun Dec 25 18:10:18 2005
@@ -118,6 +118,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.183 kaffe/kaffe/kaffe/Makefile.in:1.184
--- kaffe/kaffe/kaffe/Makefile.in:1.183	Sun Dec 18 17:35:41 2005
+++ kaffe/kaffe/kaffe/Makefile.in	Sun Dec 25 18:10:19 2005
@@ -123,6 +123,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.163 kaffe/kaffe/kaffeh/Makefile.in:1.164
--- kaffe/kaffe/kaffeh/Makefile.in:1.163	Sun Dec 18 17:35:42 2005
+++ kaffe/kaffe/kaffeh/Makefile.in	Sun Dec 25 18:10:23 2005
@@ -129,6 +129,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.215 kaffe/kaffe/kaffevm/Makefile.in:1.216
--- kaffe/kaffe/kaffevm/Makefile.in:1.215	Sun Dec 18 17:35:43 2005
+++ kaffe/kaffe/kaffevm/Makefile.in	Sun Dec 25 18:10:24 2005
@@ -162,6 +162,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.48 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.49
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.48	Sun Dec 18 17:35:43 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in	Sun Dec 25 18:10:24 2005
@@ -131,6 +131,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.141 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.142
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.141	Sun Dec 18 17:35:44 2005
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in	Sun Dec 25 18:10:25 2005
@@ -126,6 +126,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.150 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.151
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.150	Sun Dec 18 17:35:46 2005
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in	Sun Dec 25 18:10:26 2005
@@ -117,6 +117,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.160 kaffe/kaffe/kaffevm/jit/Makefile.in:1.161
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.160	Sun Dec 18 17:35:47 2005
+++ kaffe/kaffe/kaffevm/jit/Makefile.in	Sun Dec 25 18:10:26 2005
@@ -123,6 +123,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.130 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.131
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.130	Sun Dec 18 17:35:47 2005
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in	Sun Dec 25 18:10:27 2005
@@ -123,6 +123,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.54 kaffe/kaffe/kaffevm/jni/Makefile.in:1.55
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.54	Sun Dec 18 17:35:48 2005
+++ kaffe/kaffe/kaffevm/jni/Makefile.in	Sun Dec 25 18:10:30 2005
@@ -121,6 +121,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.47 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.48
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.47	Sun Dec 18 17:35:49 2005
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in	Sun Dec 25 18:10:31 2005
@@ -117,6 +117,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.150 kaffe/kaffe/kaffevm/systems/Makefile.in:1.151
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.150	Sun Dec 18 17:35:49 2005
+++ kaffe/kaffe/kaffevm/systems/Makefile.in	Sun Dec 25 18:10:31 2005
@@ -107,6 +107,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.141 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.142
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.141	Sun Dec 18 17:35:53 2005
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in	Sun Dec 25 18:10:32 2005
@@ -116,6 +116,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.4 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.5
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.4	Sun Dec 18 17:35:53 2005
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in	Sun Dec 25 18:10:32 2005
@@ -111,6 +111,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.147 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.148
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.147	Sun Dec 18 17:35:54 2005
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in	Sun Dec 25 18:10:33 2005
@@ -116,6 +116,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.151 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.152
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.151	Sun Dec 18 17:35:54 2005
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in	Sun Dec 25 18:10:33 2005
@@ -117,6 +117,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.126 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.127
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.126	Sun Dec 18 17:35:55 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Sun Dec 25 18:10:38 2005
@@ -122,6 +122,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.53 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.54
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.53	Sun Dec 18 17:35:55 2005
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in	Sun Dec 25 18:10:38 2005
@@ -118,6 +118,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.148 kaffe/kaffe/man/Makefile.in:1.149
--- kaffe/kaffe/man/Makefile.in:1.148	Sun Dec 18 17:35:56 2005
+++ kaffe/kaffe/man/Makefile.in	Sun Dec 25 18:10:39 2005
@@ -104,6 +104,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.188 kaffe/kaffe/scripts/Makefile.in:1.189
--- kaffe/kaffe/scripts/Makefile.in:1.188	Sun Dec 18 17:35:56 2005
+++ kaffe/kaffe/scripts/Makefile.in	Sun Dec 25 18:10:40 2005
@@ -119,6 +119,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.140 kaffe/kaffe/scripts/bat/Makefile.in:1.141
--- kaffe/kaffe/scripts/bat/Makefile.in:1.140	Sun Dec 18 17:35:57 2005
+++ kaffe/kaffe/scripts/bat/Makefile.in	Sun Dec 25 18:10:40 2005
@@ -99,6 +99,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.167 kaffe/kaffe/scripts/compat/Makefile.in:1.168
--- kaffe/kaffe/scripts/compat/Makefile.in:1.167	Sun Dec 18 17:35:57 2005
+++ kaffe/kaffe/scripts/compat/Makefile.in	Sun Dec 25 18:10:41 2005
@@ -105,6 +105,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.116 kaffe/kaffe/xprof/Makefile.in:1.117
--- kaffe/kaffe/xprof/Makefile.in:1.116	Sun Dec 18 17:35:58 2005
+++ kaffe/kaffe/xprof/Makefile.in	Sun Dec 25 18:10:42 2005
@@ -134,6 +134,8 @@
 CFLAGS_PG = @CFLAGS_PG@
 CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
 CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
+COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
+COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
 COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
Index: kaffe/libltdl/Makefile.in
diff -u kaffe/libltdl/Makefile.in:1.61 kaffe/libltdl/Makefile.in:1.62
--- kaffe/libltdl/Makefile.in:1.61	Sun Dec 25 02:57:14 2005
+++ kaffe/libltdl/Makefile.in	Sun Dec 25 18:10:42 2005
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-
-SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
Index: kaffe/libltdl/aclocal.m4
diff -u kaffe/libltdl/aclocal.m4:1.59 kaffe/libltdl/aclocal.m4:1.60
--- kaffe/libltdl/aclocal.m4:1.59	Sun Dec 25 02:57:14 2005
+++ kaffe/libltdl/aclocal.m4	Sun Dec 25 18:10:42 2005
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -28,7 +28,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
Index: kaffe/libltdl/configure
diff -u kaffe/libltdl/configure:1.97 kaffe/libltdl/configure:1.98
--- kaffe/libltdl/configure:1.97	Sun Dec 25 02:57:15 2005
+++ kaffe/libltdl/configure	Sun Dec 25 18:10:44 2005
@@ -1153,7 +1153,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -2541,7 +2541,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2599,7 +2600,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2715,7 +2717,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2769,7 +2772,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2814,7 +2818,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2858,7 +2863,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3147,7 +3153,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3207,7 +3214,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3874,7 +3882,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3877 "configure"' > conftest.$ac_ext
+  echo '#line 3885 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3994,7 +4002,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4565,7 +4574,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4735,7 +4745,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4802,7 +4813,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5062,7 +5074,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5120,7 +5133,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5191,7 +5205,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5235,7 +5250,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5707,7 +5723,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5710:" \
+echo "$as_me:5726:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5753,7 +5769,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5802,7 +5819,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6772,11 +6790,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:6775: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6793: $lt_compile\"" >&5)

*** Patch too long, truncated ***




More information about the kaffe mailing list