Patch: libgcj-test.spec

Anthony Green green@cygnus.com
Sat Mar 4 13:51:00 GMT 2000


I'm checking the following patch in...

This patch creates a new spec file called libgcj-test.spec.  This file
adds -L and -rpath flags pointing at the target library build
directories.

This should make adding proper java tests to gdb much easier.  We can
also use it to clean up the expect hacks in the libjava testing
framework.

Rather than write a bunch of tcl code to guess which libraries to
include and how - simply use this specs file.  It will set up the
library paths for linking _and_ running.

2000-03-04  Anthony Green  <green@redhat.com>

	* configure: Rebuilt.
	* configure.in (ZLIBTESTSPEC): New macro.
	(GCTESTSPEC): New macro.
	(LIBGCJTESTSPEC): New macro.
	* libgcj-test.spec.in: New file.

Index: libjava/libgcj-test.spec.in
===================================================================
RCS file: libgcj-test.spec.in
diff -N libgcj-test.spec.in
*** /dev/null	Tue May  5 13:32:27 1998
--- libgcj-test.spec.in	Sat Mar  4 13:40:14 2000
***************
*** 0 ****
--- 1,7 ----
+ #
+ # This spec file is read by gcj when linking.
+ # It is only used by the testing harnesses (in libjava and gdb).
+ #
+ %rename lib liborig2
+ *lib: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(liborig2)
+ 
Index: libjava/configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.52
diff -p -r1.52 configure.in
*** configure.in	2000/01/31 04:53:47	1.52
--- configure.in	2000/03/04 21:40:14
*************** AC_LINK_FILES(java/lang/nat${PROCESS}Pro
*** 174,183 ****
--- 174,188 ----
  SYSTEMSPEC=
  AC_SUBST(SYSTEMSPEC)
  
+ LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
+ AC_SUBST(LIBGCJTESTSPEC)
+ 
  AC_ARG_WITH(system-zlib,
  [  --with-system-zlib      use installed libz])
  ZLIBSPEC=
  AC_SUBST(ZLIBSPEC)
+ ZLIBTESTSPEC=
+ AC_SUBST(ZLIBTESTSPEC)
  
  dnl FIXME: this should be _libs on some hosts.
  libsubdir=.libs
*************** GCINCS=
*** 195,200 ****
--- 200,206 ----
  GCDEPS=
  GCOBJS=
  GCSPEC=
+ GCTESTSPEC=
  case "$GC" in
   boehm)
      AC_MSG_RESULT(boehm)
*************** case "$GC" in
*** 204,209 ****
--- 210,216 ----
      GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
      GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
      GCSPEC='-lgcjgc'
+     GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
      dnl We also want to pick up some cpp flags required when including
      dnl boehm-config.h.  Yuck.
      GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
*************** AC_SUBST(GCINCS)
*** 226,231 ****
--- 233,239 ----
  AC_SUBST(GCDEPS)
  AC_SUBST(GCOBJS)
  AC_SUBST(GCSPEC)
+ AC_SUBST(GCTESTSPEC)
  AC_LINK_FILES(include/$GCHDR, include/java-gc.h)
  
  
*************** if test -n "${with_cross_host}"; then
*** 358,363 ****
--- 366,372 ----
     AC_DEFINE(NO_GETUID)
  
     ZLIBSPEC=-lzgcj
+    ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
  
     # If Canadian cross, then don't pick up tools from the build
     # directory.
*************** else
*** 546,551 ****
--- 555,561 ----
        AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj)
     else
        ZLIBSPEC=-lzgcj
+       ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
     fi
  
     # On Solaris, and maybe other architectures, the Boehm collector
*************** fi
*** 720,726 ****
  here=`pwd`
  AC_SUBST(here)
  
! AC_OUTPUT(Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
  fi],
--- 730,736 ----
  here=`pwd`
  AC_SUBST(here)
  
! AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
  fi],
Index: libjava/configure
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure,v
retrieving revision 1.54
diff -p -r1.54 configure
*** configure	2000/01/31 04:53:47	1.54
--- configure	2000/03/04 21:40:18
*************** test -d java/lang || mkdir java/lang
*** 2392,2397 ****
--- 2392,2400 ----
  SYSTEMSPEC=
  
  
+ LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
+ 
+ 
  # Check whether --with-system-zlib or --without-system-zlib was given.
  if test "${with_system_zlib+set}" = set; then
    withval="$with_system_zlib"
*************** fi
*** 2400,2410 ****
  
  ZLIBSPEC=
  
  
  libsubdir=.libs
  
  echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
! echo "configure:2408: checking for garbage collector to use" >&5
  # Check whether --enable-java-gc or --disable-java-gc was given.
  if test "${enable_java_gc+set}" = set; then
    enableval="$enable_java_gc"
--- 2403,2415 ----
  
  ZLIBSPEC=
  
+ ZLIBTESTSPEC=
  
+ 
  libsubdir=.libs
  
  echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
! echo "configure:2413: checking for garbage collector to use" >&5
  # Check whether --enable-java-gc or --disable-java-gc was given.
  if test "${enable_java_gc+set}" = set; then
    enableval="$enable_java_gc"
*************** GCINCS=
*** 2419,2424 ****
--- 2424,2430 ----
  GCDEPS=
  GCOBJS=
  GCSPEC=
+ GCTESTSPEC=
  case "$GC" in
   boehm)
      echo "$ac_t""boehm" 1>&6
*************** case "$GC" in
*** 2428,2433 ****
--- 2434,2440 ----
      GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
      GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
      GCSPEC='-lgcjgc'
+     GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
              GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
      GCOBJS=boehm.lo
      GCHDR=boehm-gc.h
*************** esac
*** 2453,2460 ****
  
  
  
  echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
! echo "configure:2458: checking for threads package to use" >&5
  # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
    enableval="$enable_threads"
--- 2460,2468 ----
  
  
  
+ 
  echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
! echo "configure:2466: checking for threads package to use" >&5
  # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
    enableval="$enable_threads"
*************** EOF
*** 2619,2624 ****
--- 2627,2633 ----
  
  
     ZLIBSPEC=-lzgcj
+    ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
  
     # If Canadian cross, then don't pick up tools from the build
     # directory.
*************** else
*** 2634,2645 ****
     for ac_func in strerror ioctl select fstat open fsync sleep
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2638: 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 2643 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2643,2654 ----
     for ac_func in strerror ioctl select fstat open fsync sleep
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2647: 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 2652 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2662,2668 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2666: \"$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
--- 2671,2677 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2675: \"$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
*************** done
*** 2689,2700 ****
     for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2693: 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 2698 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2698,2709 ----
     for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2702: 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 2707 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2717,2723 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2721: \"$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
--- 2726,2732 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2730: \"$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
*************** done
*** 2744,2755 ****
     for ac_func in access stat mkdir rename rmdir unlink realpath iconv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2748: 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 2753 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2753,2764 ----
     for ac_func in access stat mkdir rename rmdir unlink realpath iconv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2757: 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 2762 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2772,2778 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2776: \"$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
--- 2781,2787 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2785: \"$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
*************** done
*** 2799,2810 ****
     for ac_func in inet_aton inet_addr
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2803: 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 2808 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2808,2819 ----
     for ac_func in inet_aton inet_addr
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2812: 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 2817 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2827,2833 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2831: \"$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
--- 2836,2842 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2840: \"$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
*************** done
*** 2854,2865 ****
     for ac_func in inet_pton uname inet_ntoa
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2858: 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 2863 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2863,2874 ----
     for ac_func in inet_pton uname inet_ntoa
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2867: 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 2872 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2882,2888 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2886: \"$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
--- 2891,2897 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2895: \"$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
*************** done
*** 2909,2920 ****
     for ac_func in backtrace fork execvp pipe
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2913: 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 2918 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2918,2929 ----
     for ac_func in backtrace fork execvp pipe
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2922: 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 2927 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2937,2943 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2941: \"$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
--- 2946,2952 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2950: \"$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
*************** done
*** 2965,2981 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2969: 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 2974 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2979: \"$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*
--- 2974,2990 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2978: 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 2983 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2988: \"$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*
*************** fi
*** 3002,3008 ****
  done
   
     echo $ac_n "checking for dladdr in -ldl""... $ac_c" 1>&6
! echo "configure:3006: checking for dladdr in -ldl" >&5
  ac_lib_var=`echo dl'_'dladdr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3011,3017 ----
  done
   
     echo $ac_n "checking for dladdr in -ldl""... $ac_c" 1>&6
! echo "configure:3015: checking for dladdr in -ldl" >&5
  ac_lib_var=`echo dl'_'dladdr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3010,3016 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3014 "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
--- 3019,3025 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3023 "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
*************** int main() {
*** 3021,3027 ****
  dladdr()
  ; return 0; }
  EOF
! if { (eval echo configure:3025: \"$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
--- 3030,3036 ----
  dladdr()
  ; return 0; }
  EOF
! if { (eval echo configure:3034: \"$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
*************** do
*** 3050,3056 ****
  
  ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_file""... $ac_c" 1>&6
! echo "configure:3054: checking for $ac_file" >&5
  if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 3059,3065 ----
  
  ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_file""... $ac_c" 1>&6
! echo "configure:3063: checking for $ac_file" >&5
  if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** done
*** 3085,3096 ****
     for ac_func in gethostbyname_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3089: 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 3094 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3094,3105 ----
     for ac_func in gethostbyname_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3098: 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 3103 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3113,3119 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3117: \"$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
--- 3122,3128 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3126: \"$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
*************** EOF
*** 3140,3146 ****
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3144 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
--- 3149,3155 ----
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3153 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
*************** rm -f conftest*
*** 3160,3166 ****
       *" -D_REENTRANT "*) ;;
       *)
  		echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6
! echo "configure:3164: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5
  if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 3169,3175 ----
       *" -D_REENTRANT "*) ;;
       *)
  		echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6
! echo "configure:3173: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5
  if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** ac_link='${CXX-g++} -o conftest${ac_exee
*** 3173,3186 ****
  cross_compiling=$ac_cv_prog_cxx_cross
  
  	  cat > conftest.$ac_ext <<EOF
! #line 3177 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=no
  else
--- 3182,3195 ----
  cross_compiling=$ac_cv_prog_cxx_cross
  
  	  cat > conftest.$ac_ext <<EOF
! #line 3186 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=no
  else
*************** else
*** 3190,3203 ****
    		CPPFLAGS_SAVE="$CPPFLAGS"
  		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
  		cat > conftest.$ac_ext <<EOF
! #line 3194 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=yes
  else
--- 3199,3212 ----
    		CPPFLAGS_SAVE="$CPPFLAGS"
  		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
  		cat > conftest.$ac_ext <<EOF
! #line 3203 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=yes
  else
*************** EOF
*** 3232,3243 ****
       esac
  
       echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6
! echo "configure:3236: checking for struct hostent_data" >&5
  if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    	cat > conftest.$ac_ext <<EOF
! #line 3241 "configure"
  #include "confdefs.h"
  
  #if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
--- 3241,3252 ----
       esac
  
       echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6
! echo "configure:3245: checking for struct hostent_data" >&5
  if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    	cat > conftest.$ac_ext <<EOF
! #line 3250 "configure"
  #include "confdefs.h"
  
  #if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
*************** int main() {
*** 3248,3254 ****
  struct hostent_data data;
  ; return 0; }
  EOF
! if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_struct_hostent_data=yes
  else
--- 3257,3263 ----
  struct hostent_data data;
  ; return 0; }
  EOF
! if { (eval echo configure:3261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_struct_hostent_data=yes
  else
*************** done
*** 3277,3288 ****
     for ac_func in gethostbyaddr_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3281: 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 3286 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3286,3297 ----
     for ac_func in gethostbyaddr_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3290: 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 3295 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3305,3311 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3309: \"$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
--- 3314,3320 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3318: \"$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
*************** EOF
*** 3332,3338 ****
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3336 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
--- 3341,3347 ----
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3345 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
*************** done
*** 3356,3367 ****
     for ac_func in gethostname
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3360: 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 3365 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3365,3376 ----
     for ac_func in gethostname
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3369: 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 3374 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3384,3390 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3388: \"$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
--- 3393,3399 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3397: \"$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
*************** EOF
*** 3408,3414 ****
  EOF
  
       cat > conftest.$ac_ext <<EOF
! #line 3412 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  EOF
--- 3417,3423 ----
  EOF
  
       cat > conftest.$ac_ext <<EOF
! #line 3421 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  EOF
*************** done
*** 3439,3450 ****
        for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3443: 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 3448 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3448,3459 ----
        for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3452: 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 3457 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3467,3473 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3471: \"$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
--- 3476,3482 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3480: \"$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
*************** done
*** 3497,3508 ****
        for ac_func in sched_yield
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3501: 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 3506 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3506,3517 ----
        for ac_func in sched_yield
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3510: 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 3515 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3525,3531 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3529: \"$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
--- 3534,3540 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3538: \"$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
*************** EOF
*** 3547,3553 ****
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6
! echo "configure:3551: checking for sched_yield in -lrt" >&5
  ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3556,3562 ----
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6
! echo "configure:3560: checking for sched_yield in -lrt" >&5
  ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3555,3561 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3559 "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
--- 3564,3570 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3568 "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
*************** int main() {
*** 3566,3572 ****
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3570: \"$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
--- 3575,3581 ----
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3579: \"$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
*************** else
*** 3592,3598 ****
    echo "$ac_t""no" 1>&6
  
  	  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
! echo "configure:3596: checking for sched_yield in -lposix4" >&5
  ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3601,3607 ----
    echo "$ac_t""no" 1>&6
  
  	  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
! echo "configure:3605: checking for sched_yield in -lposix4" >&5
  ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3600,3606 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lposix4  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3604 "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
--- 3609,3615 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lposix4  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3613 "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
*************** int main() {
*** 3611,3617 ****
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3615: \"$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
--- 3620,3626 ----
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3624: \"$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
*************** done
*** 3647,3653 ****
        # We can save a little space at runtime if the mutex has m_count
        # or __m_count.  This is a nice hack for Linux.
        cat > conftest.$ac_ext <<EOF
! #line 3651 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
--- 3656,3662 ----
        # We can save a little space at runtime if the mutex has m_count
        # or __m_count.  This is a nice hack for Linux.
        cat > conftest.$ac_ext <<EOF
! #line 3660 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
*************** int main() {
*** 3656,3662 ****
          
  ; return 0; }
  EOF
! if { (eval echo configure:3660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE_M_COUNT 1
--- 3665,3671 ----
          
  ; return 0; }
  EOF
! if { (eval echo configure:3669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE_M_COUNT 1
*************** else
*** 3668,3674 ****
    rm -rf conftest*
    
  	cat > conftest.$ac_ext <<EOF
! #line 3672 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
--- 3677,3683 ----
    rm -rf conftest*
    
  	cat > conftest.$ac_ext <<EOF
! #line 3681 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
*************** int main() {
*** 3677,3683 ****
  	  
  ; return 0; }
  EOF
! if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE___M_COUNT 1
--- 3686,3692 ----
  	  
  ; return 0; }
  EOF
! if { (eval echo configure:3690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE___M_COUNT 1
*************** rm -f conftest*
*** 3697,3708 ****
     for ac_func in gettimeofday time ftime
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3701: 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 3706 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3706,3717 ----
     for ac_func in gettimeofday time ftime
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3710: 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 3715 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3725,3731 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3729: \"$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
--- 3734,3740 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3738: \"$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
*************** done
*** 3756,3767 ****
     for ac_func in memmove
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3760: 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 3765 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3765,3776 ----
     for ac_func in memmove
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3769: 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 3774 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3784,3790 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3788: \"$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
--- 3793,3799 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3797: \"$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
*************** done
*** 3814,3825 ****
     for ac_func in memcpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3818: 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 3823 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3823,3834 ----
     for ac_func in memcpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3827: 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 3832 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3842,3848 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3846: \"$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
--- 3851,3857 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3855: \"$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
*************** done
*** 3890,3896 ****
     #--------------------------------------------------------------------
  
     echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
! echo "configure:3894: checking for socket libraries" >&5
  if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 3899,3905 ----
     #--------------------------------------------------------------------
  
     echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
! echo "configure:3903: checking for socket libraries" >&5
  if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** else
*** 3898,3909 ****
       gcj_checkBoth=0
       unset ac_cv_func_connect
       echo $ac_n "checking for connect""... $ac_c" 1>&6
! echo "configure:3902: 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 3907 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
--- 3907,3918 ----
       gcj_checkBoth=0
       unset ac_cv_func_connect
       echo $ac_n "checking for connect""... $ac_c" 1>&6
! echo "configure:3911: 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 3916 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
*************** connect();
*** 3926,3932 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3930: \"$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
--- 3935,3941 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3939: \"$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
*************** fi
*** 3949,3955 ****
       if test "$gcj_checkSocket" = 1; then
  	 unset ac_cv_func_connect
  	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:3953: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3958,3964 ----
       if test "$gcj_checkSocket" = 1; then
  	 unset ac_cv_func_connect
  	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:3962: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3957,3970 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3961 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:3968: \"$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
--- 3966,3979 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3970 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:3977: \"$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
*************** fi
*** 3991,4002 ****
  	 LIBS="$LIBS -lsocket -lnsl"
  	 unset ac_cv_func_accept
  	 echo $ac_n "checking for accept""... $ac_c" 1>&6
! echo "configure:3995: checking for accept" >&5
  if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4000 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char accept(); below.  */
--- 4000,4011 ----
  	 LIBS="$LIBS -lsocket -lnsl"
  	 unset ac_cv_func_accept
  	 echo $ac_n "checking for accept""... $ac_c" 1>&6
! echo "configure:4004: checking for accept" >&5
  if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4009 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char accept(); below.  */
*************** accept();
*** 4019,4025 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
  else
--- 4028,4034 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
  else
*************** fi
*** 4046,4057 ****
       gcj_oldLibs=$LIBS
       LIBS="$LIBS $gcj_cv_lib_sockets"
       echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! echo "configure:4050: 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 4055 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
--- 4055,4066 ----
       gcj_oldLibs=$LIBS
       LIBS="$LIBS $gcj_cv_lib_sockets"
       echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! echo "configure:4059: 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 4064 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
*************** gethostbyname();
*** 4074,4080 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4078: \"$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
--- 4083,4089 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4087: \"$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
*************** if eval "test \"`echo '$ac_cv_func_'geth
*** 4092,4098 ****
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:4096: checking for main in -lnsl" >&5
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4101,4107 ----
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:4105: checking for main in -lnsl" >&5
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4100,4113 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4104 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4111: \"$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
--- 4109,4122 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4113 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4120: \"$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
*************** echo "$ac_t""$gcj_cv_lib_sockets" 1>&6
*** 4139,4145 ****
  
     if test "$with_system_zlib" = yes; then
        echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:4143: 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
--- 4148,4154 ----
  
     if test "$with_system_zlib" = yes; then
        echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:4152: 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
*************** else
*** 4147,4153 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4151 "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
--- 4156,4162 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4160 "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
*************** int main() {
*** 4158,4164 ****
  deflate()
  ; return 0; }
  EOF
! if { (eval echo configure:4162: \"$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
--- 4167,4173 ----
  deflate()
  ; return 0; }
  EOF
! if { (eval echo configure:4171: \"$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
*************** fi
*** 4181,4193 ****
  
     else
        ZLIBSPEC=-lzgcj
     fi
  
     # On Solaris, and maybe other architectures, the Boehm collector
     # requires -ldl.
     if test "$GC" = boehm; then
        echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
! echo "configure:4191: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4190,4203 ----
  
     else
        ZLIBSPEC=-lzgcj
+       ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
     fi
  
     # On Solaris, and maybe other architectures, the Boehm collector
     # requires -ldl.
     if test "$GC" = boehm; then
        echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
! echo "configure:4201: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4195,4208 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4199 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4206: \"$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
--- 4205,4218 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4209 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4216: \"$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
*************** EOF
*** 4322,4328 ****
  # See if gcj supports -fuse-divide-subroutine.  gcc 2.95 does not, and
  # we want to continue to support that version.
  echo $ac_n "checking whether gcj supports -fuse-divide-subroutine""... $ac_c" 1>&6
! echo "configure:4326: checking whether gcj supports -fuse-divide-subroutine" >&5
  cat > conftest.java << 'END'
  public class conftest { }
  END
--- 4332,4338 ----
  # See if gcj supports -fuse-divide-subroutine.  gcc 2.95 does not, and
  # we want to continue to support that version.
  echo $ac_n "checking whether gcj supports -fuse-divide-subroutine""... $ac_c" 1>&6
! echo "configure:4336: checking whether gcj supports -fuse-divide-subroutine" >&5
  cat > conftest.java << 'END'
  public class conftest { }
  END
*************** echo "$ac_t""$use_fuse" 1>&6
*** 4339,4356 ****
  
  
  echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6
! echo "configure:4343: checking for g++ -ffloat-store bug" >&5
  save_CFLAGS="$CFLAGS"
  CFLAGS="-x c++ -O2 -ffloat-store"
  cat > conftest.$ac_ext <<EOF
! #line 4347 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() {
  
  ; return 0; }
  EOF
! if { (eval echo configure:4354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
  else
--- 4349,4366 ----
  
  
  echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6
! echo "configure:4353: checking for g++ -ffloat-store bug" >&5
  save_CFLAGS="$CFLAGS"
  CFLAGS="-x c++ -O2 -ffloat-store"
  cat > conftest.$ac_ext <<EOF
! #line 4357 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() {
  
  ; return 0; }
  EOF
! if { (eval echo configure:4364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
  else
*************** for ac_hdr in unistd.h bstring.h sys/tim
*** 4370,4386 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4374: 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 4379 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4384: \"$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*
--- 4380,4396 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4384: 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 4389 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4394: \"$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*
*************** for ac_hdr in dirent.h
*** 4410,4426 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4414: 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 4419 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4424: \"$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*
--- 4420,4436 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4424: 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 4429 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4434: \"$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*
*************** done
*** 4448,4459 ****
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:4452: 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 4457 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 4458,4469 ----
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:4462: 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 4467 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
*************** else
*** 4461,4467 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4465: \"$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*
--- 4471,4477 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4475: \"$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*
*************** rm -f conftest*
*** 4478,4484 ****
  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 4482 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 4488,4494 ----
  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 4492 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
*************** fi
*** 4496,4502 ****
  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 4500 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 4506,4512 ----
  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 4510 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
*************** if test "$cross_compiling" = yes; then
*** 4517,4523 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 4521 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 4527,4533 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 4531 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
*************** if (XOR (islower (i), ISLOWER (i)) || to
*** 4528,4534 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 4538,4544 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
*************** EOF
*** 4552,4563 ****
  fi
  
  echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
! echo "configure:4556: 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 4561 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4562,4573 ----
  fi
  
  echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
! echo "configure:4566: 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 4571 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
*************** fi
*** 4586,4594 ****
  
  
  echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
! echo "configure:4590: checking for in_addr_t" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4592 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4596,4604 ----
  
  
  echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
! echo "configure:4600: checking for in_addr_t" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4602 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
*************** int main() {
*** 4602,4608 ****
  in_addr_t foo;
  ; return 0; }
  EOF
! if { (eval echo configure:4606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_IN_ADDR_T 1
--- 4612,4618 ----
  in_addr_t foo;
  ; return 0; }
  EOF
! if { (eval echo configure:4616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_IN_ADDR_T 1
*************** fi
*** 4618,4633 ****
  rm -f conftest*
  
  echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4622: checking whether struct ip_mreq is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4624 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct ip_mreq mreq;
  ; return 0; }
  EOF
! if { (eval echo configure:4631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_STRUCT_IP_MREQ 1
--- 4628,4643 ----
  rm -f conftest*
  
  echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4632: checking whether struct ip_mreq is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4634 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct ip_mreq mreq;
  ; return 0; }
  EOF
! if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_STRUCT_IP_MREQ 1
*************** fi
*** 4643,4658 ****
  rm -f conftest*
  
  echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4647: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4649 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct sockaddr_in6 addr6;
  ; return 0; }
  EOF
! if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_INET6 1
--- 4653,4668 ----
  rm -f conftest*
  
  echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4657: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4659 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct sockaddr_in6 addr6;
  ; return 0; }
  EOF
! if { (eval echo configure:4666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_INET6 1
*************** fi
*** 4668,4683 ****
  rm -f conftest*
  
  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
! echo "configure:4672: checking for socklen_t in sys/socket.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4674 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  int main() {
  socklen_t x = 5;
  ; return 0; }
  EOF
! if { (eval echo configure:4681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_SOCKLEN_T 1
--- 4678,4693 ----
  rm -f conftest*
  
  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
! echo "configure:4682: checking for socklen_t in sys/socket.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4684 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  int main() {
  socklen_t x = 5;
  ; return 0; }
  EOF
! if { (eval echo configure:4691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_SOCKLEN_T 1
*************** fi
*** 4693,4708 ****
  rm -f conftest*
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4697: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4699 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  struct tm tim; tim.tm_gmtoff = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:4706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define STRUCT_TM_HAS_GMTOFF 1
--- 4703,4718 ----
  rm -f conftest*
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4707: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4709 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  struct tm tim; tim.tm_gmtoff = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define STRUCT_TM_HAS_GMTOFF 1
*************** else
*** 4715,4730 ****
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
     echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
! echo "configure:4719: checking for global timezone variable" >&5
              cat > conftest.$ac_ext <<EOF
! #line 4721 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  long z2 = timezone;
  ; return 0; }
  EOF
! if { (eval echo configure:4728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_TIMEZONE 1
--- 4725,4740 ----
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
     echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
! echo "configure:4729: checking for global timezone variable" >&5
              cat > conftest.$ac_ext <<EOF
! #line 4731 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  long z2 = timezone;
  ; return 0; }
  EOF
! if { (eval echo configure:4738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_TIMEZONE 1
*************** rm -f conftest*
*** 4744,4762 ****
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:4748: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4753 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
--- 4754,4772 ----
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:4758: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4763 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:4770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
*************** EOF
*** 4777,4788 ****
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:4781: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4786 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
--- 4787,4798 ----
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:4791: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4796 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
*************** int main() {
*** 4810,4816 ****
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
--- 4820,4826 ----
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
*************** EOF
*** 4842,4853 ****
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4846: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4851 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
--- 4852,4863 ----
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4856: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4861 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
*************** echo "$ac_t""$ac_cv_os_cray" 1>&6
*** 4872,4883 ****
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4876: 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 4881 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 4882,4893 ----
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4886: 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 4891 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 4900,4906 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4904: \"$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
--- 4910,4916 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4914: \"$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
*************** done
*** 4927,4933 ****
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4931: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4937,4943 ----
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4941: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** else
*** 4935,4941 ****
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
! #line 4939 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
--- 4945,4951 ----
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
! #line 4949 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
*************** main ()
*** 4954,4960 ****
    exit (find_stack_direction() < 0);
  }
  EOF
! if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
--- 4964,4970 ----
    exit (find_stack_direction() < 0);
  }
  EOF
! if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
*************** do
*** 4981,4987 ****
  # 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:4985: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4991,4997 ----
  # 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:4995: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** done
*** 5140,5146 ****
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
! trap 'rm -fr `echo "Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
--- 5150,5156 ----
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
! trap 'rm -fr `echo "Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
*************** s%@TESTSUBDIR_FALSE@%$TESTSUBDIR_FALSE%g
*** 5223,5234 ****
--- 5233,5247 ----
  s%@LIBDATASTARTSPEC@%$LIBDATASTARTSPEC%g
  s%@CPP@%$CPP%g
  s%@SYSTEMSPEC@%$SYSTEMSPEC%g
+ s%@LIBGCJTESTSPEC@%$LIBGCJTESTSPEC%g
  s%@ZLIBSPEC@%$ZLIBSPEC%g
+ s%@ZLIBTESTSPEC@%$ZLIBTESTSPEC%g
  s%@GCLIBS@%$GCLIBS%g
  s%@GCINCS@%$GCINCS%g
  s%@GCDEPS@%$GCDEPS%g
  s%@GCOBJS@%$GCOBJS%g
  s%@GCSPEC@%$GCSPEC%g
+ s%@GCTESTSPEC@%$GCTESTSPEC%g
  s%@THREADLIBS@%$THREADLIBS%g
  s%@THREADINCS@%$THREADINCS%g
  s%@THREADDEPS@%$THREADDEPS%g
*************** EOF
*** 5298,5304 ****
  
  cat >> $CONFIG_STATUS <<EOF
  
! CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile"}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--- 5311,5317 ----
  
  cat >> $CONFIG_STATUS <<EOF
  
! CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile"}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California


More information about the Java-patches mailing list