[kaffe] Update to xprofiling...

Jim Pick jim at kaffe.org
Thu May 30 11:36:06 PDT 2002


I applied the bits of this patch that weren't already there.

Cheers,

 - Jim

On Tue, 2002-05-28 at 06:21, Jukka Santala wrote:
> Includes same patch I posted earlier to configure.in, but doesn't appear
> to have been applied in yet. This time accompanied by re-generated
> configure-script to make it seem bigger. For some reason my system changed
> some of the compile-tests aesthetically (main() vs. int main(), return vs.
> exit) as well, even though I should have same autoconf version in use.
> Regenerate configure if required.
> 
> Additional patch: Modifications to kaffexprof script to work with the new
> directory-structure & changes to nm output.
> 
>  -Jukka Santala
> ----
> 

> Index: configure
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/configure,v
> retrieving revision 1.182
> diff -u -r1.182 configure
> --- configure	11 May 2002 17:03:17 -0000	1.182
> +++ configure	27 May 2002 09:19:49 -0000
> @@ -5670,6 +5670,15 @@
>    ENABLE_XPROF_FALSE=
>  fi
>  
> +if test x"$enable_xprofiling" = x"yes"; then
> +  if test -f "$srcdir/config/$Khost_cpu/$Khost_os/xprofile-md.h"; then
> +    CONFIG_XPROFILE_MD_H="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/xprofile-md.h"
> +    
> +  else
> +    { echo "configure: error: Profiling not supported in $Khost_cpu-$Khost_os" 1>&2; exit 1; }
> +  fi
> +fi
> +
>  
>  # Check whether --enable-xdebugging or --disable-xdebugging was given.
>  if test "${enable_xdebugging+set}" = set; then
> @@ -5715,7 +5724,7 @@
>  
>  
>  echo $ac_n "checking gprof(4) profiling support""... $ac_c" 1>&6
> -echo "configure:5719: checking gprof(4) profiling support" >&5
> +echo "configure:5728: checking gprof(4) profiling support" >&5
>  if test x"${with_profiling}" = x"yes" ; then
>  	CFLAGS="$CFLAGS -pg"
>  	CPPFLAGS="$CPPFLAGS -DKAFFE_CPROFILER"
> @@ -5732,7 +5741,7 @@
>  fi
>  
>  echo $ac_n "checking sun compatibility mode""... $ac_c" 1>&6
> -echo "configure:5736: checking sun compatibility mode" >&5
> +echo "configure:5745: checking sun compatibility mode" >&5
>  if test x"${with_suncompat+set}" != x"set" ; then
>  	with_suncompat=yes
>  fi
> @@ -5755,7 +5764,7 @@
>  fi
>  
>  echo $ac_n "checking thread system""... $ac_c" 1>&6
> -echo "configure:5759: checking thread system" >&5
> +echo "configure:5768: checking thread system" >&5
>  if test x"$with_threads" = x"" ; then
>  	with_threads=unix-jthreads
>  fi
> @@ -5771,7 +5780,7 @@
>  KAFFEVM_TRAMPOLINES_C=
>  if test "$with_engine" != "intrp" ; then
>  	echo $ac_n "checking for trampolines""... $ac_c" 1>&6
> -echo "configure:5775: checking for trampolines" >&5
> +echo "configure:5784: checking for trampolines" >&5
>  	if test -f $srcdir/config/$Khost_cpu/trampolines.c ; then
>  		KAFFEVM_TRAMPOLINES_C="\$(top_srcdir)/config/$Khost_cpu/trampolines.c"
>  		
> @@ -5823,7 +5832,7 @@
>  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
>  # ./install, which can be erroneously created by make from ./install.sh.
>  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
> -echo "configure:5827: checking for a BSD compatible install" >&5
> +echo "configure:5836: checking for a BSD compatible install" >&5
>  if test -z "$INSTALL"; then
>  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -5876,7 +5885,7 @@
>  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>  
>  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
> -echo "configure:5880: checking whether ${MAKE-make} sets \${MAKE}" >&5
> +echo "configure:5889: checking whether ${MAKE-make} sets \${MAKE}" >&5
>  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -5905,7 +5914,7 @@
>  # Extract the first word of "jikes", so it can be a program name with args.
>  set dummy jikes; ac_word=$2
>  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:5909: checking for $ac_word" >&5
> +echo "configure:5918: checking for $ac_word" >&5
>  if eval "test \"`echo '$''{'ac_cv_prog_JIKES'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -5934,7 +5943,7 @@
>  # Extract the first word of "zip", so it can be a program name with args.
>  set dummy zip; ac_word=$2
>  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:5938: checking for $ac_word" >&5
> +echo "configure:5947: checking for $ac_word" >&5
>  if eval "test \"`echo '$''{'ac_cv_prog_ZIP'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -5963,7 +5972,7 @@
>  
>  if test "$LN_S" = "" ; then
>  	echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
> -echo "configure:5967: checking whether ln -s works" >&5
> +echo "configure:5976: checking whether ln -s works" >&5
>  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -5994,7 +6003,7 @@
>  
>  
>  echo $ac_n "checking size of short""... $ac_c" 1>&6
> -echo "configure:5998: checking size of short" >&5
> +echo "configure:6007: checking size of short" >&5
>  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6002,18 +6011,18 @@
>    ac_cv_sizeof_short=0
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6006 "configure"
> +#line 6015 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
> -int main()
> +main()
>  {
>    FILE *f=fopen("conftestval", "w");
> -  if (!f) return(1);
> +  if (!f) exit(1);
>    fprintf(f, "%d\n", sizeof(short));
> -  return(0);
> +  exit(0);
>  }
>  EOF
> -if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_sizeof_short=`cat conftestval`
>  else
> @@ -6033,7 +6042,7 @@
>  
>  
>  echo $ac_n "checking size of int""... $ac_c" 1>&6
> -echo "configure:6037: checking size of int" >&5
> +echo "configure:6046: checking size of int" >&5
>  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6041,18 +6050,18 @@
>    ac_cv_sizeof_int=0
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6045 "configure"
> +#line 6054 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
> -int main()
> +main()
>  {
>    FILE *f=fopen("conftestval", "w");
> -  if (!f) return(1);
> +  if (!f) exit(1);
>    fprintf(f, "%d\n", sizeof(int));
> -  return(0);
> +  exit(0);
>  }
>  EOF
> -if { (eval echo configure:6056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_sizeof_int=`cat conftestval`
>  else
> @@ -6072,7 +6081,7 @@
>  
>  
>  echo $ac_n "checking size of long""... $ac_c" 1>&6
> -echo "configure:6076: checking size of long" >&5
> +echo "configure:6085: checking size of long" >&5
>  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6080,18 +6089,18 @@
>    ac_cv_sizeof_long=0
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6084 "configure"
> +#line 6093 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
> -int main()
> +main()
>  {
>    FILE *f=fopen("conftestval", "w");
> -  if (!f) return(1);
> +  if (!f) exit(1);
>    fprintf(f, "%d\n", sizeof(long));
> -  return(0);
> +  exit(0);
>  }
>  EOF
> -if { (eval echo configure:6095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_sizeof_long=`cat conftestval`
>  else
> @@ -6111,7 +6120,7 @@
>  
>  
>  echo $ac_n "checking size of long long""... $ac_c" 1>&6
> -echo "configure:6115: checking size of long long" >&5
> +echo "configure:6124: checking size of long long" >&5
>  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6119,18 +6128,18 @@
>    ac_cv_sizeof_long_long=0
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6123 "configure"
> +#line 6132 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
> -int main()
> +main()
>  {
>    FILE *f=fopen("conftestval", "w");
> -  if (!f) return(1);
> +  if (!f) exit(1);
>    fprintf(f, "%d\n", sizeof(long long));
> -  return(0);
> +  exit(0);
>  }
>  EOF
> -if { (eval echo configure:6134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_sizeof_long_long=`cat conftestval`
>  else
> @@ -6150,7 +6159,7 @@
>  
>  
>  echo $ac_n "checking size of __int64""... $ac_c" 1>&6
> -echo "configure:6154: checking size of __int64" >&5
> +echo "configure:6163: checking size of __int64" >&5
>  if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6158,18 +6167,18 @@
>    ac_cv_sizeof___int64=0
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6162 "configure"
> +#line 6171 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
> -int main()
> +main()
>  {
>    FILE *f=fopen("conftestval", "w");
> -  if (!f) return(1);
> +  if (!f) exit(1);
>    fprintf(f, "%d\n", sizeof(__int64));
> -  return(0);
> +  exit(0);
>  }
>  EOF
> -if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_sizeof___int64=`cat conftestval`
>  else
> @@ -6189,7 +6198,7 @@
>  
>  
>  echo $ac_n "checking size of void*""... $ac_c" 1>&6
> -echo "configure:6193: checking size of void*" >&5
> +echo "configure:6202: checking size of void*" >&5
>  if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6197,18 +6206,18 @@
>    ac_cv_sizeof_voidp=0
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6201 "configure"
> +#line 6210 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
> -int main()
> +main()
>  {
>    FILE *f=fopen("conftestval", "w");
> -  if (!f) return(1);
> +  if (!f) exit(1);
>    fprintf(f, "%d\n", sizeof(void*));
> -  return(0);
> +  exit(0);
>  }
>  EOF
> -if { (eval echo configure:6212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_sizeof_voidp=`cat conftestval`
>  else
> @@ -6230,7 +6239,7 @@
>  
>  
>  echo $ac_n "checking alignment of void*""... $ac_c" 1>&6
> -echo "configure:6234: checking alignment of void*" >&5
> +echo "configure:6243: checking alignment of void*" >&5
>  if eval "test \"`echo '$''{'ac_cv_alignmentof_voidp'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6238,7 +6247,7 @@
>    ac_cv_alignmentof_voidp=$ac_cv_sizeof_voidp
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6242 "configure"
> +#line 6251 "configure"
>  #include "confdefs.h"
>  #include <stdio.h>
>  main() { struct { char c; void *p; } t; FILE *f;
> @@ -6248,7 +6257,7 @@
>    fprintf (f, "%d", ((char*) &t.p)-((char*) &t));
>    fclose(f); exit (0); }
>  EOF
> -if { (eval echo configure:6252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_alignmentof_voidp=`cat conftestdata`
>  else
> @@ -6270,12 +6279,12 @@
>  
>  
>  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
> -echo "configure:6274: checking return type of signal handlers" >&5
> +echo "configure:6283: checking return type of signal handlers" >&5
>  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6279 "configure"
> +#line 6288 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <signal.h>
> @@ -6292,7 +6301,7 @@
>  int i;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:6305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_type_signal=void
>  else
> @@ -6312,7 +6321,7 @@
>  
>  
>  echo $ac_n "checking whether signal handlers are one-shot""... $ac_c" 1>&6
> -echo "configure:6316: checking whether signal handlers are one-shot" >&5
> +echo "configure:6325: checking whether signal handlers are one-shot" >&5
>  if eval "test \"`echo '$''{'kaffe_cv_signal_one_shot'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -6320,7 +6329,7 @@
>    kaffe_cv_signal_one_shot=cross
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6324 "configure"
> +#line 6333 "configure"
>  #include "confdefs.h"
>  
>  #include <signal.h>
> @@ -6339,7 +6348,7 @@
>  }
>  
>  EOF
> -if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    kaffe_cv_signal_one_shot=no
>  else
> @@ -6363,12 +6372,12 @@
>  fi
>  
>  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
> -echo "configure:6367: checking for ANSI C header files" >&5
> +echo "configure:6376: checking for ANSI C header files" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6372 "configure"
> +#line 6381 "configure"
>  #include "confdefs.h"
>  #include <stdlib.h>
>  #include <stdarg.h>
> @@ -6376,7 +6385,7 @@
>  #include <float.h>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:6380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:6389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -6393,7 +6402,7 @@
>  if test $ac_cv_header_stdc = yes; then
>    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
>  cat > conftest.$ac_ext <<EOF
> -#line 6397 "configure"
> +#line 6406 "configure"
>  #include "confdefs.h"
>  #include <string.h>
>  EOF
> @@ -6411,7 +6420,7 @@
>  if test $ac_cv_header_stdc = yes; then
>    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
>  cat > conftest.$ac_ext <<EOF
> -#line 6415 "configure"
> +#line 6424 "configure"
>  #include "confdefs.h"
>  #include <stdlib.h>
>  EOF
> @@ -6432,7 +6441,7 @@
>    :
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6436 "configure"
> +#line 6445 "configure"
>  #include "confdefs.h"
>  #include <ctype.h>
>  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
> @@ -6443,7 +6452,7 @@
>  exit (0); }
>  
>  EOF
> -if { (eval echo configure:6447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:6456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    :
>  else
> @@ -6467,12 +6476,12 @@
>  fi
>  
>  echo $ac_n "checking for size_t""... $ac_c" 1>&6
> -echo "configure:6471: checking for size_t" >&5
> +echo "configure:6480: checking for size_t" >&5
>  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6476 "configure"
> +#line 6485 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #if STDC_HEADERS
> @@ -6502,12 +6511,12 @@
>  
>  
>  echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
> -echo "configure:6506: checking for ssize_t" >&5
> +echo "configure:6515: checking for ssize_t" >&5
>  if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6511 "configure"
> +#line 6520 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #if STDC_HEADERS
> @@ -6549,7 +6558,7 @@
>  KSAVE_LIBS="$LIBS"
>  LIBS="$M_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6
> -echo "configure:6553: checking for _mwvalidcheckl in -lmw" >&5
> +echo "configure:6562: checking for _mwvalidcheckl in -lmw" >&5
>  ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -6557,7 +6566,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lmw  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 6561 "configure"
> +#line 6570 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -6568,7 +6577,7 @@
>  _mwvalidcheckl()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -6601,7 +6610,7 @@
>  KSAVE_LIBS="$LIBS"
>  LIBS="$M_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
> -echo "configure:6605: checking for sin in -lm" >&5
> +echo "configure:6614: checking for sin in -lm" >&5
>  ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -6609,7 +6618,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lm  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 6613 "configure"
> +#line 6622 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -6620,7 +6629,7 @@
>  sin()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -6664,7 +6673,7 @@
>  	KSAVE_LIBS="$LIBS"
>  LIBS="$VM_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for ffi_call in -lffi""... $ac_c" 1>&6
> -echo "configure:6668: checking for ffi_call in -lffi" >&5
> +echo "configure:6677: checking for ffi_call in -lffi" >&5
>  ac_lib_var=`echo ffi'_'ffi_call | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -6672,7 +6681,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lffi  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 6676 "configure"
> +#line 6685 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -6683,7 +6692,7 @@
>  ffi_call()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -6724,7 +6733,7 @@
>  	KSAVE_LIBS="$LIBS"
>  LIBS="$VM_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for __moddi3 in -lgcc""... $ac_c" 1>&6
> -echo "configure:6728: checking for __moddi3 in -lgcc" >&5
> +echo "configure:6737: checking for __moddi3 in -lgcc" >&5
>  ac_lib_var=`echo gcc'_'__moddi3 | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -6732,7 +6741,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lgcc  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 6736 "configure"
> +#line 6745 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -6743,7 +6752,7 @@
>  __moddi3()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -6779,12 +6788,12 @@
>  
>  
>  echo $ac_n "checking for gethostname""... $ac_c" 1>&6
> -echo "configure:6783: checking for gethostname" >&5
> +echo "configure:6792: checking for gethostname" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6788 "configure"
> +#line 6797 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char gethostname(); below.  */
> @@ -6807,7 +6816,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_gethostname=yes"
>  else
> @@ -6830,7 +6839,7 @@
>        KSAVE_LIBS="$LIBS"
>  LIBS="$NET_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
> -echo "configure:6834: checking for gethostname in -lnsl" >&5
> +echo "configure:6843: checking for gethostname in -lnsl" >&5
>  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -6838,7 +6847,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lnsl  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 6842 "configure"
> +#line 6851 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -6849,7 +6858,7 @@
>  gethostname()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -6881,12 +6890,12 @@
>  
>  fi
>  echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
> -echo "configure:6885: checking for gethostbyname" >&5
> +echo "configure:6894: checking for gethostbyname" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6890 "configure"
> +#line 6899 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char gethostbyname(); below.  */
> @@ -6909,7 +6918,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_gethostbyname=yes"
>  else
> @@ -6932,7 +6941,7 @@
>        KSAVE_LIBS="$LIBS"
>  LIBS="$NET_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
> -echo "configure:6936: checking for gethostbyname in -lnsl" >&5
> +echo "configure:6945: checking for gethostbyname in -lnsl" >&5
>  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -6940,7 +6949,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lnsl  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 6944 "configure"
> +#line 6953 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -6951,7 +6960,7 @@
>  gethostbyname()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:6964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -6983,12 +6992,12 @@
>  
>  fi
>  echo $ac_n "checking for connect""... $ac_c" 1>&6
> -echo "configure:6987: checking for connect" >&5
> +echo "configure:6996: checking for connect" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 6992 "configure"
> +#line 7001 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char connect(); below.  */
> @@ -7011,7 +7020,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_connect=yes"
>  else
> @@ -7034,7 +7043,7 @@
>    KSAVE_LIBS="$LIBS"
>  LIBS="$NET_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
> -echo "configure:7038: checking for connect in -lsocket" >&5
> +echo "configure:7047: checking for connect in -lsocket" >&5
>  ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7042,7 +7051,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lsocket  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7046 "configure"
> +#line 7055 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7053,7 +7062,7 @@
>  connect()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7089,7 +7098,7 @@
>  KSAVE_LIBS="$LIBS"
>  LIBS="$ZIP_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
> -echo "configure:7093: checking for deflate in -lz" >&5
> +echo "configure:7102: checking for deflate in -lz" >&5
>  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7097,7 +7106,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lz  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7101 "configure"
> +#line 7110 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7108,7 +7117,7 @@
>  deflate()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7144,7 +7153,7 @@
>  KSAVE_LIBS="$LIBS"
>  LIBS="$MATH_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for mpz_get_d in -lgmp""... $ac_c" 1>&6
> -echo "configure:7148: checking for mpz_get_d in -lgmp" >&5
> +echo "configure:7157: checking for mpz_get_d in -lgmp" >&5
>  ac_lib_var=`echo gmp'_'mpz_get_d | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7152,7 +7161,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lgmp  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7156 "configure"
> +#line 7165 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7163,7 +7172,7 @@
>  mpz_get_d()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7197,7 +7206,7 @@
>      KSAVE_LIBS="$LIBS"
>  LIBS="$MATH_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for __gmpz_get_d in -lgmp""... $ac_c" 1>&6
> -echo "configure:7201: checking for __gmpz_get_d in -lgmp" >&5
> +echo "configure:7210: checking for __gmpz_get_d in -lgmp" >&5
>  ac_lib_var=`echo gmp'_'__gmpz_get_d | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7205,7 +7214,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lgmp  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7209 "configure"
> +#line 7218 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7216,7 +7225,7 @@
>  __gmpz_get_d()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7253,12 +7262,12 @@
>  for ac_func in MD2Init MD4Init MD5Init
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:7257: checking for $ac_func" >&5
> +echo "configure:7266: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 7262 "configure"
> +#line 7271 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -7281,7 +7290,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -7309,7 +7318,7 @@
>    KSAVE_LIBS="$LIBS"
>  LIBS="$SECURITY_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for MD5Init in -lmd""... $ac_c" 1>&6
> -echo "configure:7313: checking for MD5Init in -lmd" >&5
> +echo "configure:7322: checking for MD5Init in -lmd" >&5
>  ac_lib_var=`echo md'_'MD5Init | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7317,7 +7326,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lmd  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7321 "configure"
> +#line 7330 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7328,7 +7337,7 @@
>  MD5Init()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7366,7 +7375,7 @@
>  	KSAVE_LIBS="$LIBS"
>  LIBS="$VM_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
> -echo "configure:7370: checking for pthread_create in -lpthread" >&5
> +echo "configure:7379: checking for pthread_create in -lpthread" >&5
>  ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7374,7 +7383,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lpthread  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7378 "configure"
> +#line 7387 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7385,7 +7394,7 @@
>  pthread_create()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7425,7 +7434,7 @@
>  # Uses ac_ vars as temps to allow command line to override cache and checks.
>  # --without-x overrides everything else, but does not touch the cache.
>  echo $ac_n "checking for X""... $ac_c" 1>&6
> -echo "configure:7429: checking for X" >&5
> +echo "configure:7438: checking for X" >&5
>  
>  # Check whether --with-x or --without-x was given.
>  if test "${with_x+set}" = set; then
> @@ -7487,12 +7496,12 @@
>  
>    # First, try using that file with no special directory specified.
>  cat > conftest.$ac_ext <<EOF
> -#line 7491 "configure"
> +#line 7500 "configure"
>  #include "confdefs.h"
>  #include <$x_direct_test_include>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:7496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:7505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -7561,14 +7570,14 @@
>    ac_save_LIBS="$LIBS"
>    LIBS="-l$x_direct_test_library $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7565 "configure"
> +#line 7574 "configure"
>  #include "confdefs.h"
>  
>  int main() {
>  ${x_direct_test_function}()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    LIBS="$ac_save_LIBS"
>  # We can link X programs with no special library path.
> @@ -7674,17 +7683,17 @@
>      case "`(uname -sr) 2>/dev/null`" in
>      "SunOS 5"*)
>        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
> -echo "configure:7678: checking whether -R must be followed by a space" >&5
> +echo "configure:7687: checking whether -R must be followed by a space" >&5
>        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
>        cat > conftest.$ac_ext <<EOF
> -#line 7681 "configure"
> +#line 7690 "configure"
>  #include "confdefs.h"
>  
>  int main() {
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    ac_R_nospace=yes
>  else
> @@ -7700,14 +7709,14 @@
>        else
>  	LIBS="$ac_xsave_LIBS -R $x_libraries"
>  	cat > conftest.$ac_ext <<EOF
> -#line 7704 "configure"
> +#line 7713 "configure"
>  #include "confdefs.h"
>  
>  int main() {
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    ac_R_space=yes
>  else
> @@ -7739,7 +7748,7 @@
>      # libraries were built with DECnet support.  And karl at cs.umb.edu says
>      # the Alpha needs dnet_stub (dnet does not exist).
>      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
> -echo "configure:7743: checking for dnet_ntoa in -ldnet" >&5
> +echo "configure:7752: checking for dnet_ntoa in -ldnet" >&5
>  ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7747,7 +7756,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-ldnet  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7751 "configure"
> +#line 7760 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7758,7 +7767,7 @@
>  dnet_ntoa()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7780,7 +7789,7 @@
>  
>      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
>        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
> -echo "configure:7784: checking for dnet_ntoa in -ldnet_stub" >&5
> +echo "configure:7793: checking for dnet_ntoa in -ldnet_stub" >&5
>  ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7788,7 +7797,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-ldnet_stub  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7792 "configure"
> +#line 7801 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7799,7 +7808,7 @@
>  dnet_ntoa()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7828,12 +7837,12 @@
>      # The nsl library prevents programs from opening the X display
>      # on Irix 5.2, according to dickey at clark.net.
>      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
> -echo "configure:7832: checking for gethostbyname" >&5
> +echo "configure:7841: checking for gethostbyname" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 7837 "configure"
> +#line 7846 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char gethostbyname(); below.  */
> @@ -7856,7 +7865,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_gethostbyname=yes"
>  else
> @@ -7877,7 +7886,7 @@
>  
>      if test $ac_cv_func_gethostbyname = no; then
>        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
> -echo "configure:7881: checking for gethostbyname in -lnsl" >&5
> +echo "configure:7890: checking for gethostbyname in -lnsl" >&5
>  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7885,7 +7894,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lnsl  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7889 "configure"
> +#line 7898 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7896,7 +7905,7 @@
>  gethostbyname()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -7926,12 +7935,12 @@
>      # -lsocket must be given before -lnsl if both are needed.
>      # We assume that if connect needs -lnsl, so does gethostbyname.
>      echo $ac_n "checking for connect""... $ac_c" 1>&6
> -echo "configure:7930: checking for connect" >&5
> +echo "configure:7939: checking for connect" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 7935 "configure"
> +#line 7944 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char connect(); below.  */
> @@ -7954,7 +7963,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:7967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_connect=yes"
>  else
> @@ -7975,7 +7984,7 @@
>  
>      if test $ac_cv_func_connect = no; then
>        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
> -echo "configure:7979: checking for connect in -lsocket" >&5
> +echo "configure:7988: checking for connect in -lsocket" >&5
>  ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -7983,7 +7992,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 7987 "configure"
> +#line 7996 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -7994,7 +8003,7 @@
>  connect()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:7998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8018,12 +8027,12 @@
>  
>      # gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX.
>      echo $ac_n "checking for remove""... $ac_c" 1>&6
> -echo "configure:8022: checking for remove" >&5
> +echo "configure:8031: checking for remove" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8027 "configure"
> +#line 8036 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char remove(); below.  */
> @@ -8046,7 +8055,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_remove=yes"
>  else
> @@ -8067,7 +8076,7 @@
>  
>      if test $ac_cv_func_remove = no; then
>        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
> -echo "configure:8071: checking for remove in -lposix" >&5
> +echo "configure:8080: checking for remove in -lposix" >&5
>  ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8075,7 +8084,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lposix  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8079 "configure"
> +#line 8088 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8086,7 +8095,7 @@
>  remove()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8110,12 +8119,12 @@
>  
>      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
>      echo $ac_n "checking for shmat""... $ac_c" 1>&6
> -echo "configure:8114: checking for shmat" >&5
> +echo "configure:8123: checking for shmat" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8119 "configure"
> +#line 8128 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char shmat(); below.  */
> @@ -8138,7 +8147,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_shmat=yes"
>  else
> @@ -8159,7 +8168,7 @@
>  
>      if test $ac_cv_func_shmat = no; then
>        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
> -echo "configure:8163: checking for shmat in -lipc" >&5
> +echo "configure:8172: checking for shmat in -lipc" >&5
>  ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8167,7 +8176,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lipc  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8171 "configure"
> +#line 8180 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8178,7 +8187,7 @@
>  shmat()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8211,7 +8220,7 @@
>    # libraries we check for below, so use a different variable.
>    #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
>    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
> -echo "configure:8215: checking for IceConnectionNumber in -lICE" >&5
> +echo "configure:8224: checking for IceConnectionNumber in -lICE" >&5
>  ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8219,7 +8228,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8223 "configure"
> +#line 8232 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8230,7 +8239,7 @@
>  IceConnectionNumber()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8260,7 +8269,7 @@
>        KSAVE_LIBS="$LIBS"
>  LIBS="$X_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for __T_9__nothrow in -lCsup""... $ac_c" 1>&6
> -echo "configure:8264: checking for __T_9__nothrow in -lCsup" >&5
> +echo "configure:8273: checking for __T_9__nothrow in -lCsup" >&5
>  ac_lib_var=`echo Csup'_'__T_9__nothrow | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8268,7 +8277,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lCsup  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8272 "configure"
> +#line 8281 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8279,7 +8288,7 @@
>  __T_9__nothrow()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8314,7 +8323,7 @@
>    KSAVE_LIBS="$LIBS"
>  LIBS="$X_PRE_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for XShmQueryExtension in -lXext""... $ac_c" 1>&6
> -echo "configure:8318: checking for XShmQueryExtension in -lXext" >&5
> +echo "configure:8327: checking for XShmQueryExtension in -lXext" >&5
>  ac_lib_var=`echo Xext'_'XShmQueryExtension | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8322,7 +8331,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lXext  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8326 "configure"
> +#line 8335 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8333,7 +8342,7 @@
>  XShmQueryExtension()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8369,17 +8378,17 @@
>  do
>  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
> -echo "configure:8373: checking for $ac_hdr" >&5
> +echo "configure:8382: checking for $ac_hdr" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8378 "configure"
> +#line 8387 "configure"
>  #include "confdefs.h"
>  #include <$ac_hdr>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:8383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:8392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -8410,7 +8419,7 @@
>    KSAVE_LIBS="$LIBS"
>  LIBS="$JPEG_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
> -echo "configure:8414: checking for jpeg_read_header in -ljpeg" >&5
> +echo "configure:8423: checking for jpeg_read_header in -ljpeg" >&5
>  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8418,7 +8427,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-ljpeg  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8422 "configure"
> +#line 8431 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8429,7 +8438,7 @@
>  jpeg_read_header()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8462,7 +8471,7 @@
>    KSAVE_LIBS="$LIBS"
>  LIBS="$PNG_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6
> -echo "configure:8466: checking for png_create_info_struct in -lpng" >&5
> +echo "configure:8475: checking for png_create_info_struct in -lpng" >&5
>  ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8470,7 +8479,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lpng  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8474 "configure"
> +#line 8483 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8481,7 +8490,7 @@
>  png_create_info_struct()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8512,12 +8521,12 @@
>  LIBS="$KSAVE_LIBS"
>  
>    echo $ac_n "checking for a usable version of gif_lib.h""... $ac_c" 1>&6
> -echo "configure:8516: checking for a usable version of gif_lib.h" >&5
> +echo "configure:8525: checking for a usable version of gif_lib.h" >&5
>  if eval "test \"`echo '$''{'kaffe_cv_gif_lib_version'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    	cat > conftest.$ac_ext <<EOF
> -#line 8521 "configure"
> +#line 8530 "configure"
>  #include "confdefs.h"
>  
>  #include <gif_lib.h>
> @@ -8528,7 +8537,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:8541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    kaffe_cv_gif_lib_version=yes
>  else
> @@ -8549,7 +8558,7 @@
>      KSAVE_LIBS="$LIBS"
>  LIBS="$GIF_LIBS $KSAVE_LIBS"
>  echo $ac_n "checking for DGifOpen in -lungif""... $ac_c" 1>&6
> -echo "configure:8553: checking for DGifOpen in -lungif" >&5
> +echo "configure:8562: checking for DGifOpen in -lungif" >&5
>  ac_lib_var=`echo ungif'_'DGifOpen | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8557,7 +8566,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lungif  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8561 "configure"
> +#line 8570 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8568,7 +8577,7 @@
>  DGifOpen()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8625,12 +8634,12 @@
>  
>  
>  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
> -echo "configure:8629: checking for ANSI C header files" >&5
> +echo "configure:8638: checking for ANSI C header files" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8634 "configure"
> +#line 8643 "configure"
>  #include "confdefs.h"
>  #include <stdlib.h>
>  #include <stdarg.h>
> @@ -8638,7 +8647,7 @@
>  #include <float.h>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:8642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:8651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -8655,7 +8664,7 @@
>  if test $ac_cv_header_stdc = yes; then
>    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
>  cat > conftest.$ac_ext <<EOF
> -#line 8659 "configure"
> +#line 8668 "configure"
>  #include "confdefs.h"
>  #include <string.h>
>  EOF
> @@ -8673,7 +8682,7 @@
>  if test $ac_cv_header_stdc = yes; then
>    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
>  cat > conftest.$ac_ext <<EOF
> -#line 8677 "configure"
> +#line 8686 "configure"
>  #include "confdefs.h"
>  #include <stdlib.h>
>  EOF
> @@ -8694,7 +8703,7 @@
>    :
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8698 "configure"
> +#line 8707 "configure"
>  #include "confdefs.h"
>  #include <ctype.h>
>  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
> @@ -8705,7 +8714,7 @@
>  exit (0); }
>  
>  EOF
> -if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:8718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    :
>  else
> @@ -8773,17 +8782,17 @@
>  do
>  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
> -echo "configure:8777: checking for $ac_hdr" >&5
> +echo "configure:8786: checking for $ac_hdr" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8782 "configure"
> +#line 8791 "configure"
>  #include "confdefs.h"
>  #include <$ac_hdr>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:8787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:8796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -8815,12 +8824,12 @@
>  do
>  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
> -echo "configure:8819: checking for $ac_hdr that defines DIR" >&5
> +echo "configure:8828: checking for $ac_hdr that defines DIR" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8824 "configure"
> +#line 8833 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <$ac_hdr>
> @@ -8828,7 +8837,7 @@
>  DIR *dirp = 0;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:8841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    eval "ac_cv_header_dirent_$ac_safe=yes"
>  else
> @@ -8853,7 +8862,7 @@
>  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
>  if test $ac_header_dirent = dirent.h; then
>  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
> -echo "configure:8857: checking for opendir in -ldir" >&5
> +echo "configure:8866: checking for opendir in -ldir" >&5
>  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8861,7 +8870,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-ldir  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8865 "configure"
> +#line 8874 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8872,7 +8881,7 @@
>  opendir()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8894,7 +8903,7 @@
>  
>  else
>  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
> -echo "configure:8898: checking for opendir in -lx" >&5
> +echo "configure:8907: checking for opendir in -lx" >&5
>  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -8902,7 +8911,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lx  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 8906 "configure"
> +#line 8915 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -8913,7 +8922,7 @@
>  opendir()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:8926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -8941,17 +8950,17 @@
>  do
>  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
> -echo "configure:8945: checking for $ac_hdr" >&5
> +echo "configure:8954: checking for $ac_hdr" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8950 "configure"
> +#line 8959 "configure"
>  #include "confdefs.h"
>  #include <$ac_hdr>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:8955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:8964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -8974,12 +8983,12 @@
>   for ac_func in getrusage
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:8978: checking for $ac_func" >&5
> +echo "configure:8987: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 8983 "configure"
> +#line 8992 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -9002,7 +9011,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:9015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -9060,12 +9069,12 @@
>    for ac_func in __throw __terminate_func __get_eh_info
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:9064: checking for $ac_func" >&5
> +echo "configure:9073: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9069 "configure"
> +#line 9078 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -9088,7 +9097,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:9101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -9119,7 +9128,7 @@
>  # Extract the first word of "$ac_prog", so it can be a program name with args.
>  set dummy $ac_prog; ac_word=$2
>  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:9123: checking for $ac_word" >&5
> +echo "configure:9132: checking for $ac_word" >&5
>  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -9151,7 +9160,7 @@
>  
>  
>  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
> -echo "configure:9155: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
> +echo "configure:9164: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
>  
>  ac_ext=C
>  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
> @@ -9162,12 +9171,12 @@
>  
>  cat > conftest.$ac_ext << EOF
>  
> -#line 9166 "configure"
> +#line 9175 "configure"
>  #include "confdefs.h"
>  
>  int main(){return(0);}
>  EOF
> -if { (eval echo configure:9171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    ac_cv_prog_cxx_works=yes
>    # If we can't run a trivial program, we are probably using a cross compiler.
>    if (./conftest; exit) 2>/dev/null; then
> @@ -9193,12 +9202,12 @@
>    have_recent_gcc=no
>  fi
>  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
> -echo "configure:9197: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
> +echo "configure:9206: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
>  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
>  cross_compiling=$ac_cv_prog_cxx_cross
>  
>  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
> -echo "configure:9202: checking whether we are using GNU C++" >&5
> +echo "configure:9211: checking whether we are using GNU C++" >&5
>  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -9207,7 +9216,7 @@
>    yes;
>  #endif
>  EOF
> -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
> +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
>    ac_cv_prog_gxx=yes
>  else
>    ac_cv_prog_gxx=no
> @@ -9226,7 +9235,7 @@
>  ac_save_CXXFLAGS="$CXXFLAGS"
>  CXXFLAGS=
>  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
> -echo "configure:9230: checking whether ${CXX-g++} accepts -g" >&5
> +echo "configure:9239: checking whether ${CXX-g++} accepts -g" >&5
>  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -9257,57 +9266,6 @@
>    fi
>  fi
>  
> -for ac_declaration in \
> -   ''\
> -   '#include <stdlib.h>' \
> -   'extern "C" void std::exit (int) throw (); using std::exit;' \
> -   'extern "C" void std::exit (int); using std::exit;' \
> -   'extern "C" void exit (int) throw ();' \
> -   'extern "C" void exit (int);' \
> -   'void exit (int);'
> -do
> -  cat > conftest.$ac_ext <<EOF
> -#line 9271 "configure"
> -#include "confdefs.h"
> -#include <stdlib.h>
> -$ac_declaration
> -int main() {
> -exit (42);
> -; return 0; }
> -EOF
> -if { (eval echo configure:9279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> -  :
> -else
> -  echo "configure: failed program was:" >&5
> -  cat conftest.$ac_ext >&5
> -  rm -rf conftest*
> -  continue
> -fi
> -rm -f conftest*
> -  cat > conftest.$ac_ext <<EOF
> -#line 9289 "configure"
> -#include "confdefs.h"
> -$ac_declaration
> -int main() {
> -exit (42);
> -; return 0; }
> -EOF
> -if { (eval echo configure:9296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> -  rm -rf conftest*
> -  break
> -else
> -  echo "configure: failed program was:" >&5
> -  cat conftest.$ac_ext >&5
> -fi
> -rm -f conftest*
> -done
> -if test -n "$ac_declaration"; then
> -  echo '#ifdef __cplusplus' >>confdefs.h
> -  echo $ac_declaration      >>confdefs.h
> -  echo '#endif'             >>confdefs.h
> -fi
> -
> -
>    
>  
>    if test "x$have_recent_gcc" = xyes; then
> @@ -9320,7 +9278,7 @@
>  cross_compiling=$ac_cv_prog_cxx_cross
>  
>      echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
> -echo "configure:9324: checking how to run the C++ preprocessor" >&5
> +echo "configure:9282: checking how to run the C++ preprocessor" >&5
>  if test -z "$CXXCPP"; then
>  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -9333,12 +9291,12 @@
>  cross_compiling=$ac_cv_prog_cxx_cross
>    CXXCPP="${CXX-g++} -E"
>    cat > conftest.$ac_ext <<EOF
> -#line 9337 "configure"
> +#line 9295 "configure"
>  #include "confdefs.h"
>  #include <stdlib.h>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:9342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:9300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    :
> @@ -9364,17 +9322,17 @@
>  
>  ac_safe=`echo "java/lang/Class.h" | sed 'y%./+-%__p_%'`
>  echo $ac_n "checking for java/lang/Class.h""... $ac_c" 1>&6
> -echo "configure:9368: checking for java/lang/Class.h" >&5
> +echo "configure:9326: checking for java/lang/Class.h" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9373 "configure"
> +#line 9331 "configure"
>  #include "confdefs.h"
>  #include <java/lang/Class.h>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:9378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:9336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -9422,7 +9380,7 @@
>  fi
>  
>  echo $ac_n "checking whether to enable GCJ support""... $ac_c" 1>&6
> -echo "configure:9426: checking whether to enable GCJ support" >&5
> +echo "configure:9384: checking whether to enable GCJ support" >&5
>  echo "$ac_t""$enable_gcj" 1>&6
>  
>  
> @@ -9443,7 +9401,7 @@
>  fi
>  
>  echo $ac_n "checking whether to enable MIPS II instructions""... $ac_c" 1>&6
> -echo "configure:9447: checking whether to enable MIPS II instructions" >&5
> +echo "configure:9405: checking whether to enable MIPS II instructions" >&5
>  if test "x$enable_mips2" != "xno"; then
>      cat >> confdefs.h <<\EOF
>  #define HAVE_MIPSII_INSTRUCTIONS 1
> @@ -9455,12 +9413,12 @@
>  
>  
>  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
> -echo "configure:9459: checking whether time.h and sys/time.h may both be included" >&5
> +echo "configure:9417: checking whether time.h and sys/time.h may both be included" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9464 "configure"
> +#line 9422 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <sys/time.h>
> @@ -9469,7 +9427,7 @@
>  struct tm *tp;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_header_time=yes
>  else
> @@ -9490,12 +9448,12 @@
>  fi
>  
>  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
> -echo "configure:9494: checking whether struct tm is in sys/time.h or time.h" >&5
> +echo "configure:9452: checking whether struct tm is in sys/time.h or time.h" >&5
>  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9499 "configure"
> +#line 9457 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <time.h>
> @@ -9503,7 +9461,7 @@
>  struct tm *tp; tp->tm_sec;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_struct_tm=time.h
>  else
> @@ -9524,12 +9482,12 @@
>  fi
>  
>  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
> -echo "configure:9528: checking for tm_zone in struct tm" >&5
> +echo "configure:9486: checking for tm_zone in struct tm" >&5
>  if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9533 "configure"
> +#line 9491 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <$ac_cv_struct_tm>
> @@ -9537,7 +9495,7 @@
>  struct tm tm; tm.tm_zone;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_struct_tm_zone=yes
>  else
> @@ -9557,12 +9515,12 @@
>  
>  else
>    echo $ac_n "checking for tzname""... $ac_c" 1>&6
> -echo "configure:9561: checking for tzname" >&5
> +echo "configure:9519: checking for tzname" >&5
>  if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9566 "configure"
> +#line 9524 "configure"
>  #include "confdefs.h"
>  #include <time.h>
>  #ifndef tzname /* For SGI.  */
> @@ -9572,7 +9530,7 @@
>  atoi(*tzname);
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:9534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    ac_cv_var_tzname=yes
>  else
> @@ -9594,14 +9552,14 @@
>  fi
>  
>  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
> -echo "configure:9598: checking whether byte ordering is bigendian" >&5
> +echo "configure:9556: checking whether byte ordering is bigendian" >&5
>  if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    ac_cv_c_bigendian=unknown
>  # See if sys/param.h defines the BYTE_ORDER macro.
>  cat > conftest.$ac_ext <<EOF
> -#line 9605 "configure"
> +#line 9563 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <sys/param.h>
> @@ -9612,11 +9570,11 @@
>  #endif
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    # It does; now see whether it defined to BIG_ENDIAN or not.
>  cat > conftest.$ac_ext <<EOF
> -#line 9620 "configure"
> +#line 9578 "configure"
>  #include "confdefs.h"
>  #include <sys/types.h>
>  #include <sys/param.h>
> @@ -9627,7 +9585,7 @@
>  #endif
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_c_bigendian=yes
>  else
> @@ -9647,7 +9605,7 @@
>      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9651 "configure"
> +#line 9609 "configure"
>  #include "confdefs.h"
>  main () {
>    /* Are we little or big endian?  From Harbison&Steele.  */
> @@ -9660,7 +9618,7 @@
>    exit (u.c[sizeof (long) - 1] == 1);
>  }
>  EOF
> -if { (eval echo configure:9664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:9622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_c_bigendian=no
>  else
> @@ -9684,14 +9642,14 @@
>  fi
>  
>  echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
> -echo "configure:9688: checking whether char is unsigned" >&5
> +echo "configure:9646: checking whether char is unsigned" >&5
>  if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    if test "$GCC" = yes; then
>    # GCC predefines this symbol on systems where it applies.
>  cat > conftest.$ac_ext <<EOF
> -#line 9695 "configure"
> +#line 9653 "configure"
>  #include "confdefs.h"
>  #ifdef __CHAR_UNSIGNED__
>    yes
> @@ -9713,7 +9671,7 @@
>      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9717 "configure"
> +#line 9675 "configure"
>  #include "confdefs.h"
>  /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
>  #if !defined(__STDC__) || __STDC__ != 1
> @@ -9723,7 +9681,7 @@
>    volatile char c = 255; exit(c < 0);
>  }
>  EOF
> -if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:9685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_c_char_unsigned=yes
>  else
> @@ -9747,21 +9705,21 @@
>  fi
>  
>  echo $ac_n "checking for inline""... $ac_c" 1>&6
> -echo "configure:9751: checking for inline" >&5
> +echo "configure:9709: checking for inline" >&5
>  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    ac_cv_c_inline=no
>  for ac_kw in inline __inline__ __inline; do
>    cat > conftest.$ac_ext <<EOF
> -#line 9758 "configure"
> +#line 9716 "configure"
>  #include "confdefs.h"
>  
>  int main() {
>  } $ac_kw foo() {
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_c_inline=$ac_kw; break
>  else
> @@ -9853,12 +9811,12 @@
>  
>  
>  echo $ac_n "checking for struct sigcontext""... $ac_c" 1>&6
> -echo "configure:9857: checking for struct sigcontext" >&5
> +echo "configure:9815: checking for struct sigcontext" >&5
>  if eval "test \"`echo '$''{'ac_cv_struct_sigcontext'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9862 "configure"
> +#line 9820 "configure"
>  #include "confdefs.h"
>  #include <asm/signal.h>
>  #include <asm/sigcontext.h>
> @@ -9866,7 +9824,7 @@
>  struct sigcontext t;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_struct_sigcontext=yes
>  else
> @@ -9888,19 +9846,19 @@
>  
>  
>  echo $ac_n "checking for struct sigcontext_struct (without asm/sigcontext.h)""... $ac_c" 1>&6
> -echo "configure:9892: checking for struct sigcontext_struct (without asm/sigcontext.h)" >&5
> +echo "configure:9850: checking for struct sigcontext_struct (without asm/sigcontext.h)" >&5
>  if eval "test \"`echo '$''{'ac_cv_struct_sigcontext_struct'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9897 "configure"
> +#line 9855 "configure"
>  #include "confdefs.h"
>  #include <asm/signal.h>
>  int main() {
>  struct sigcontext_struct t;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_struct_sigcontext_struct=yes
>  else
> @@ -9915,12 +9873,12 @@
>  echo "$ac_t""$ac_cv_struct_sigcontext_struct" 1>&6
>  
>  echo $ac_n "checking for struct sigcontext_struct (with asm/sigcontext.h)""... $ac_c" 1>&6
> -echo "configure:9919: checking for struct sigcontext_struct (with asm/sigcontext.h)" >&5
> +echo "configure:9877: checking for struct sigcontext_struct (with asm/sigcontext.h)" >&5
>  if eval "test \"`echo '$''{'ac_cv_struct_sigcontext_struct_with'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9924 "configure"
> +#line 9882 "configure"
>  #include "confdefs.h"
>  #include <asm/signal.h>
>  #include <asm/sigcontext.h>
> @@ -9928,7 +9886,7 @@
>  struct sigcontext_struct t;
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:9890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_struct_sigcontext_struct_with=yes
>  else
> @@ -9952,12 +9910,12 @@
>  
>  
>  echo $ac_n "checking for strftime""... $ac_c" 1>&6
> -echo "configure:9956: checking for strftime" >&5
> +echo "configure:9914: checking for strftime" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 9961 "configure"
> +#line 9919 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char strftime(); below.  */
> @@ -9980,7 +9938,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:9984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:9942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_strftime=yes"
>  else
> @@ -10002,7 +9960,7 @@
>    echo "$ac_t""no" 1>&6
>  # strftime is in -lintl on SCO UNIX.
>  echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
> -echo "configure:10006: checking for strftime in -lintl" >&5
> +echo "configure:9964: checking for strftime in -lintl" >&5
>  ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
>  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
> @@ -10010,7 +9968,7 @@
>    ac_save_LIBS="$LIBS"
>  LIBS="-lintl  $LIBS"
>  cat > conftest.$ac_ext <<EOF
> -#line 10014 "configure"
> +#line 9972 "configure"
>  #include "confdefs.h"
>  /* Override any gcc2 internal prototype to avoid an error.  */
>  /* We use char because int might match the return type of a gcc2
> @@ -10021,7 +9979,7 @@
>  strftime()
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_lib_$ac_lib_var=yes"
>  else
> @@ -10047,21 +10005,21 @@
>  
>  fi
>  
> -for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
> +for ac_hdr in unistd.h
>  do
>  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
> -echo "configure:10055: checking for $ac_hdr" >&5
> +echo "configure:10013: checking for $ac_hdr" >&5
>  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10060 "configure"
> +#line 10018 "configure"
>  #include "confdefs.h"
>  #include <$ac_hdr>
>  EOF
>  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
> -{ (eval echo configure:10065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
> +{ (eval echo configure:10023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>  if test -z "$ac_err"; then
>    rm -rf conftest*
> @@ -10090,12 +10048,12 @@
>  for ac_func in getpagesize
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:10094: checking for $ac_func" >&5
> +echo "configure:10052: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10099 "configure"
> +#line 10057 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -10118,7 +10076,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:10080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -10143,7 +10101,7 @@
>  done
>  
>  echo $ac_n "checking for working mmap""... $ac_c" 1>&6
> -echo "configure:10147: checking for working mmap" >&5
> +echo "configure:10105: checking for working mmap" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10151,7 +10109,7 @@
>    ac_cv_func_mmap_fixed_mapped=no
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10155 "configure"
> +#line 10113 "configure"
>  #include "confdefs.h"
>  
>  /* Thanks to Mike Haertel and Jim Avera for this test.
> @@ -10179,24 +10137,11 @@
>  #include <fcntl.h>
>  #include <sys/mman.h>
>  
> -#if HAVE_SYS_TYPES_H
> -# include <sys/types.h>
> -#endif
> -
> -#if HAVE_STDLIB_H
> -# include <stdlib.h>
> -#endif
> -
> -#if HAVE_SYS_STAT_H
> -# include <sys/stat.h>
> -#endif
> -
> -#if HAVE_UNISTD_H
> -# include <unistd.h>
> -#endif
> -
>  /* This mess was copied from the GNU getpagesize.h.  */
>  #ifndef HAVE_GETPAGESIZE
> +# ifdef HAVE_UNISTD_H
> +#  include <unistd.h>
> +# endif
>  
>  /* Assume that all systems that can run configure have sys/param.h.  */
>  # ifndef HAVE_SYS_PARAM_H
> @@ -10304,7 +10249,7 @@
>  }
>  
>  EOF
> -if { (eval echo configure:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:10253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_func_mmap_fixed_mapped=yes
>  else
> @@ -10329,12 +10274,12 @@
>  for ac_func in select socket getsockname getpagesize memcpy memmove mkdir getcwd chdir getwd gettimeofday ftime time uname getuid localtime iconv 
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:10333: checking for $ac_func" >&5
> +echo "configure:10278: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10338 "configure"
> +#line 10283 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -10357,7 +10302,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:10306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -10387,12 +10332,12 @@
>  for ac_func in remainder remainderf fmod fmodf drem rint floor ceil finite isinf isnan strtod mergesort
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:10391: checking for $ac_func" >&5
> +echo "configure:10336: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10396 "configure"
> +#line 10341 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -10415,7 +10360,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -10442,7 +10387,7 @@
>  LIBS="$KSAVE_LIBS"
>  
>  echo $ac_n "checking whether long division is broken""... $ac_c" 1>&6
> -echo "configure:10446: checking whether long division is broken" >&5
> +echo "configure:10391: checking whether long division is broken" >&5
>  if eval "test \"`echo '$''{'ac_cv_long_division_broken'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10450,7 +10395,7 @@
>    ac_cv_long_division_broken=cross
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10454 "configure"
> +#line 10399 "configure"
>  #include "confdefs.h"
>  
>  #include <limits.h>
> @@ -10463,7 +10408,7 @@
>  T foo(T i, T j) { return i / j; }
>  
>  EOF
> -if { (eval echo configure:10467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:10412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_long_division_broken=no
>  else
> @@ -10486,7 +10431,7 @@
>  fi
>  
>  echo $ac_n "checking whether long modulo is broken""... $ac_c" 1>&6
> -echo "configure:10490: checking whether long modulo is broken" >&5
> +echo "configure:10435: checking whether long modulo is broken" >&5
>  if eval "test \"`echo '$''{'ac_cv_long_modulo_broken'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10494,7 +10439,7 @@
>    ac_cv_long_modulo_broken=cross
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10498 "configure"
> +#line 10443 "configure"
>  #include "confdefs.h"
>  
>  #include <limits.h>
> @@ -10507,7 +10452,7 @@
>  T foo(T i, T j) { return i % j; }
>  
>  EOF
> -if { (eval echo configure:10511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:10456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_long_modulo_broken=no
>  else
> @@ -10530,7 +10475,7 @@
>  fi
>  
>  echo $ac_n "checking whether long long modulo is broken""... $ac_c" 1>&6
> -echo "configure:10534: checking whether long long modulo is broken" >&5
> +echo "configure:10479: checking whether long long modulo is broken" >&5
>  if eval "test \"`echo '$''{'ac_cv_long_long_modulo_broken'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10538,7 +10483,7 @@
>    ac_cv_long_long_modulo_broken=cross
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10542 "configure"
> +#line 10487 "configure"
>  #include "confdefs.h"
>  
>  #include <limits.h>
> @@ -10551,7 +10496,7 @@
>  T foo(T i, T j) { return i % j; }
>  
>  EOF
> -if { (eval echo configure:10555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:10500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_long_long_modulo_broken=no
>  else
> @@ -10574,7 +10519,7 @@
>  fi
>  
>  echo $ac_n "checking whether strtod(\"-0.0\") is broken""... $ac_c" 1>&6
> -echo "configure:10578: checking whether strtod(\"-0.0\") is broken" >&5
> +echo "configure:10523: checking whether strtod(\"-0.0\") is broken" >&5
>  if eval "test \"`echo '$''{'ac_cv_strtod_m0_broken'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10582,7 +10527,7 @@
>    ac_cv_strtod_m0_broken=cross
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10586 "configure"
> +#line 10531 "configure"
>  #include "confdefs.h"
>  
>  #include <stdlib.h>
> @@ -10631,7 +10576,7 @@
>  }
>  
>  EOF
> -if { (eval echo configure:10635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
> +if { (eval echo configure:10580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
>  then
>    ac_cv_strtod_m0_broken=no
>  else
> @@ -10656,12 +10601,12 @@
>  for ac_func in strerror hstrerror fcntl ioctl alarm setitimer sigprocmask sigsetmask sigemptyset sigaddset signal sigaction sbrk valloc memalign mallopt mprotect madvise waitpid kill fork execve execvp sync fsync atexit on_exit vsnprintf snprintf 
>  do
>  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
> -echo "configure:10660: checking for $ac_func" >&5
> +echo "configure:10605: checking for $ac_func" >&5
>  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10665 "configure"
> +#line 10610 "configure"
>  #include "confdefs.h"
>  /* System header to define __stub macros and hopefully few prototypes,
>      which can conflict with char $ac_func(); below.  */
> @@ -10684,7 +10629,7 @@
>  
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:10633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>    rm -rf conftest*
>    eval "ac_cv_func_$ac_func=yes"
>  else
> @@ -10711,19 +10656,19 @@
>  
>  if test "$Khost_cpu" = "alpha" ; then
>    echo $ac_n "checking for alpha support of amask instruction""... $ac_c" 1>&6
> -echo "configure:10715: checking for alpha support of amask instruction" >&5
> +echo "configure:10660: checking for alpha support of amask instruction" >&5
>  if eval "test \"`echo '$''{'ac_cv_alpha_asm_amask'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10720 "configure"
> +#line 10665 "configure"
>  #include "confdefs.h"
>  
>  int main() {
>   long r; __asm__("amask 1,%0" : "=r"(r)); return !r; 
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:10672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_alpha_asm_amask=yes
>  else
> @@ -10748,12 +10693,12 @@
>  
>  
>  echo $ac_n "checking for declaration of select""... $ac_c" 1>&6
> -echo "configure:10752: checking for declaration of select" >&5
> +echo "configure:10697: checking for declaration of select" >&5
>  if eval "test \"`echo '$''{'ac_cv_declared_select'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10757 "configure"
> +#line 10702 "configure"
>  #include "confdefs.h"
>  
>  #ifdef HAVE_UNISTD_H
> @@ -10770,7 +10715,7 @@
>   void *foo = select; 
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:10719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_declared_select=yes
>  else
> @@ -10793,12 +10738,12 @@
>  
>  
>  echo $ac_n "checking for declaration of swab""... $ac_c" 1>&6
> -echo "configure:10797: checking for declaration of swab" >&5
> +echo "configure:10742: checking for declaration of swab" >&5
>  if eval "test \"`echo '$''{'ac_cv_declared_swab'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 10802 "configure"
> +#line 10747 "configure"
>  #include "confdefs.h"
>  
>  #ifdef HAVE_UNISTD_H
> @@ -10812,7 +10757,7 @@
>   void *foo = swab; 
>  ; return 0; }
>  EOF
> -if { (eval echo configure:10816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:10761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>    rm -rf conftest*
>    ac_cv_declared_swab=yes
>  else
> @@ -10898,7 +10843,7 @@
>    # Extract the first word of "kaffeh", so it can be a program name with args.
>  set dummy kaffeh; ac_word=$2
>  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:10902: checking for $ac_word" >&5
> +echo "configure:10847: checking for $ac_word" >&5
>  if eval "test \"`echo '$''{'ac_cv_path_KAFFEH'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10975,7 +10920,7 @@
>  
>  
>  echo $ac_n "checking for path separator""... $ac_c" 1>&6
> -echo "configure:10979: checking for path separator" >&5
> +echo "configure:10924: checking for path separator" >&5
>  if eval "test \"`echo '$''{'ac_cv_kaffe_pathsep'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -10992,7 +10937,7 @@
>  
>  
>  echo $ac_n "checking for directory separator""... $ac_c" 1>&6
> -echo "configure:10996: checking for directory separator" >&5
> +echo "configure:10941: checking for directory separator" >&5
>  if eval "test \"`echo '$''{'ac_cv_kaffe_dirsep'+set}'`\" = set"; then
>    echo $ac_n "(cached) $ac_c" 1>&6
>  else
> @@ -11290,6 +11235,7 @@
>  s%@engine_frag@%%g
>  s%@ENABLE_XPROF_TRUE@%$ENABLE_XPROF_TRUE%g
>  s%@ENABLE_XPROF_FALSE@%$ENABLE_XPROF_FALSE%g
> +s%@CONFIG_XPROFILE_MD_H@%$CONFIG_XPROFILE_MD_H%g
>  s%@NEED_LIBXPROF_TRUE@%$NEED_LIBXPROF_TRUE%g
>  s%@NEED_LIBXPROF_FALSE@%$NEED_LIBXPROF_FALSE%g
>  s%@SUN_COMPAT_TRUE@%$SUN_COMPAT_TRUE%g
> Index: configure.in
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/configure.in,v
> retrieving revision 1.159
> diff -u -r1.159 configure.in
> --- configure.in	11 May 2002 17:03:17 -0000	1.159
> +++ configure.in	27 May 2002 09:19:49 -0000
> @@ -346,6 +346,15 @@
>  dnl ENABLE_XPROF controls installation of xprof scripts in kaffe/scripts/Makefile.am
>  AM_CONDITIONAL(ENABLE_XPROF, test x"$enable_xprofiling" = x"yes")
>  
> +if test x"$enable_xprofiling" = x"yes"; then
> +  if test -f "$srcdir/config/$Khost_cpu/$Khost_os/xprofile-md.h"; then
> +    CONFIG_XPROFILE_MD_H="\$(top_srcdir)/config/$Khost_cpu/$Khost_os/xprofile-md.h"
> +    AC_SUBST(CONFIG_XPROFILE_MD_H)
> +  else
> +    AC_MSG_ERROR(Profiling not supported in $Khost_cpu-$Khost_os)
> +  fi
> +fi
> +
>  dnl =========================================================================
>  dnl Allow support for debugging of C/jitted code
>  dnl -------------------------------------------------------------------------
> Index: kaffe/scripts/kaffexprof.in
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/kaffe/scripts/kaffexprof.in,v
> retrieving revision 1.1
> diff -u -r1.1 kaffexprof.in
> --- kaffe/scripts/kaffexprof.in	23 May 2000 17:55:37 -0000	1.1
> +++ kaffe/scripts/kaffexprof.in	27 May 2002 09:19:53 -0000
> @@ -20,7 +20,7 @@
>  exec_prefix="@exec_prefix@"
>  
>  if test -f "$1.s"; then
> -    $NM -n @libexecdir@/@Kaffe_TRANSF@ | $AWK -f @bindir@/nm2as.awk | cat - $1.s | $AS - -o $1
> +    $NM -n @jrebindir@/@Kaffe_TRANSF@ | $AWK -f @bindir@/nm2as.awk | cat - $1.s | $AS - -o $1
>      $GPROF $1 $2
>  else
>      echo "Can't find assembler file $1.s"
> Index: kaffe/scripts/nm2as.awk
> ===================================================================
> RCS file: /cvs/kaffe/kaffe/kaffe/scripts/nm2as.awk,v
> retrieving revision 1.1
> diff -u -r1.1 nm2as.awk
> --- kaffe/scripts/nm2as.awk	23 May 2000 17:55:37 -0000	1.1
> +++ kaffe/scripts/nm2as.awk	27 May 2002 09:19:53 -0000
> @@ -7,7 +7,7 @@
>  }
>  
>  /[0-9]/ {
> -	if( $1 != "U" )
> +	if( $1 != "U" && $1 != "w" )
>  	{
>  		printf(".weak %s\n", $3);
>  		printf("%s = 0x%s\n", $3, $1);






More information about the kaffe mailing list