--- /dev/c/develop/ports/orig/fileutils-4.1/configure.in	2001-04-29 07:02:32.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/configure.in	2002-06-11 13:41:42.000000000 +0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 AC_INIT(src/ls.c)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(config.h:config.h-in)
 AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([fileutils], [4.1])
@@ -44,6 +44,10 @@ if test $fu_cv_sys_truncating_statfs = y
 fi
 AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
 
+# (rich@phekda.freeserve.co.uk): Check for lstat and fchown, which DJGPP
+# doesn't have.
+AC_CHECK_FUNCS(lstat fchown)
+
 jm_LIB_CHECK
 
 AM_GNU_GETTEXT
--- /dev/c/develop/ports/orig/fileutils-4.1/configure	2001-04-29 08:26:08.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/configure	2002-06-11 14:19:36.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.49e.
+# Generated by Autoconf 2.50.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -80,7 +80,11 @@ exec 6>&1
 #
 # Initializations.
 #
-ac_default_prefix=/usr/local
+if test -d /dev/env/DJDIR -a -n "$DJGPP" -a -f "$DJGPP"; then
+  ac_default_prefix=/dev/env/DJDIR
+else
+  ac_default_prefix=/usr/local
+fi
 cross_compiling=no
 subdirs=
 MFLAGS= MAKEFLAGS=
@@ -566,14 +570,14 @@ ac_env_LDFLAGS_set=${LDFLAGS+set}
 ac_env_LDFLAGS_value=$LDFLAGS
 ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
 ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
 ac_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
 
 #
 # Report the --help message.
@@ -673,9 +677,9 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPP         C preprocessor
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -736,7 +740,7 @@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.49e.  Invocation command line was
+generated by GNU Autoconf 2.50.  Invocation command line was
 
   $ $0 $@
 
@@ -860,7 +864,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:863: loading site script $ac_site_file" >&5
+    { echo "$as_me:867: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -871,7 +875,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:874: loading cache $cache_file" >&5
+    { echo "$as_me:878: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -879,7 +883,7 @@ echo "$as_me: loading cache $cache_file"
     esac
   fi
 else
-  { echo "$as_me:882: creating cache $cache_file" >&5
+  { echo "$as_me:886: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -895,30 +899,30 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:898: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:902: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_suggest_removing_cache=: ;;
     ,set)
-      { echo "$as_me:902: WARNING: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:906: WARNING: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
       ac_suggest_removing_cache=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:908: WARNING: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:912: WARNING: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:910: WARNING:   former value:  $ac_old_val" >&5
+        { echo "$as_me:914: WARNING:   former value:  $ac_old_val" >&5
 echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:912: WARNING:   current value: $ac_new_val" >&5
+        { echo "$as_me:916: WARNING:   current value: $ac_new_val" >&5
 echo "$as_me: WARNING:   current value: $ac_new_val" >&2;}
         ac_suggest_removing_cache=:
       fi;;
   esac
 done
 if $ac_suggest_removing_cache; then
-  { echo "$as_me:919: WARNING: changes in the environment can compromise the build" >&5
+  { echo "$as_me:923: WARNING: changes in the environment can compromise the build" >&5
 echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
-  { echo "$as_me:921: WARNING: consider removing $cache_file and starting over" >&5
+  { echo "$as_me:925: WARNING: consider removing $cache_file and starting over" >&5
 echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
 fi
 
@@ -937,10 +941,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:940: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:944: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:943: \$? = $ac_status" >&5
+  echo "$as_me:947: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -949,9 +953,7 @@ fi
 PATH_SEPARATOR="$ac_path_separator"
 rm -f conftest.sh
 
-ac_config_headers="$ac_config_headers config.h"
-
-  ac_config_commands="$ac_config_commands default-1"
+		    		    		    ac_config_headers="$ac_config_headers config.h:config.h-in"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -970,7 +972,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:973: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:975: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -980,11 +982,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:983: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:985: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:987: checking build system type" >&5
+echo "$as_me:989: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -993,23 +995,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:996: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:998: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1000: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1002: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1005: result: $ac_cv_build" >&5
+echo "$as_me:1007: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1012: checking host system type" >&5
+echo "$as_me:1014: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1018,12 +1020,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1021: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1023: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1026: result: $ac_cv_host" >&5
+echo "$as_me:1028: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1042,7 +1044,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1045: checking for a BSD compatible install" >&5
+echo "$as_me:1047: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1074,6 +1076,25 @@ else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
 	  fi
+	elif test -n "$ac_executable_extensions"; then
+	  for ac_exec_ext in $ac_executable_extensions; do
+  	    if $as_executable_p "$ac_dir/$ac_prog$ac_exec_ext"; then
+	      if test $ac_prog = install &&
+ 	        grep dspmsg "$ac_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1
+              then
+	        # AIX install.  It has an incompatible calling convention.
+	        :
+	      elif test $ac_prog = install &&
+	        grep pwplus "$ac_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1
+              then
+	        # program-specific install script used by HP pwplus--don't use.
+	        :
+	      else
+	        ac_cv_path_install="$ac_dir/$ac_prog$ac_exec_ext -c"
+	        break 3
+	      fi
+            fi
+	  done
 	fi
       done
       ;;
@@ -1091,7 +1112,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1094: result: $INSTALL" >&5
+echo "$as_me:1115: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1102,7 +1123,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1105: checking whether build environment is sane" >&5
+echo "$as_me:1126: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -1118,6 +1139,7 @@ if (
       # -L didn't work.
       set X `ls -t $srcdir/configure conftest.file`
    fi
+   rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
       && test "$*" != "X conftest.file $srcdir/configure"; then
 
@@ -1125,7 +1147,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:1128: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1150: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -1138,14 +1160,13 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:1141: error: newly created file is older than distributed files!
+   { { echo "$as_me:1163: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -f conftest*
-echo "$as_me:1148: result: yes" >&5
+echo "$as_me:1169: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
@@ -1166,15 +1187,17 @@ test "$program_suffix" != NONE &&
 # sed with no file args requires a program.
 test -z "$program_transform_name" && program_transform_name="s,x,x,"
 
-test x"${MISSING+set}" = xset ||
-  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH="$ac_path_separator"; cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
-if eval "$MISSING --run :"; then
+if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
   am_backtick='`'
-  { echo "$as_me:1177: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+  { echo "$as_me:1200: WARNING: ${am_backtick}missing' script is too old or missing" >&5
 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
@@ -1182,7 +1205,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1185: checking for $ac_word" >&5
+echo "$as_me:1208: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1195,27 +1218,36 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:1200: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_AWK="$ac_prog"
+  echo "$as_me:1223: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_AWK="$ac_prog"
+      echo "$as_me:1229: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1208: result: $AWK" >&5
+  echo "$as_me:1240: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1211: result: no" >&5
+  echo "$as_me:1243: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:1218: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1250: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1235,11 +1267,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1238: result: yes" >&5
+  echo "$as_me:1270: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1242: result: no" >&5
+  echo "$as_me:1274: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1249,36 +1281,48 @@ if test "${enable_dependency_tracking+se
   enableval="$enable_dependency_tracking"
 
 fi;
-if test "x$enable_dependency_tracking" = xno; then
-  AMDEP="#"
-else
+if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
-  if test ! -f "$am_depcomp"; then
-    AMDEP="#"
-  else
-    AMDEP=
-  fi
+  AMDEPBACKSLASH='\'
 fi
 
-if test -z "$AMDEP"; then
-  AMDEPBACKSLASH='\'
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
 else
-  AMDEPBACKSLASH=
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
 fi
 
-if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
   DEPDIR=.deps
-  # We redirect because .deps might already exist and be populated.
-  # In this situation we don't want to see an error.
-  rmdir .deps > /dev/null 2>&1
 else
+  # MS-DOS does not allow filenames that begin with a dot.
   DEPDIR=_deps
 fi
+rmdir .deps 2>/dev/null
+
+# Autoconf 2.50 computes the path separator for us; 2.13 doesn't
+if test x$ac_path_separator = x; then
+  echo "#! $SHELL" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) 2>/dev/null; then
+    ac_path_separator=';'
+  else
+    ac_path_separator=:
+  fi
+  PATH_SEPARATOR=$ac_path_separator
+
+  rm -f conftest.sh
+fi
 
 # test to see if srcdir already configured
-if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+if test "`CDPATH=$ac_path_separator; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:1281: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1325: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1298,6 +1342,14 @@ EOF
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 
+# Autoconf 2.50 always computes EXEEXT.  However we need to be
+# compatible with 2.13, for now.  So we always define EXEEXT, but we
+# don't compute it.
+
+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
+# requests that it be used.  This is a bit dumb.
+: ${OBJEXT=o}
+
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
@@ -1312,54 +1364,16 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
 
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-if test -z "$install_sh"; then
-   for install_sh in "$ac_aux_dir/install-sh" \
-                     "$ac_aux_dir/install.sh" \
-                     "${am_missing_run}${ac_auxdir}/install-sh";
-   do
-     test -f "$install_sh" && break
-   done
-   # FIXME: an evil hack: we remove the SHELL invocation from
-   # install_sh because automake adds it back in.  Sigh.
-   install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
-fi
-
-# We'd like to do this but we can't because it will unconditionally
-# require config.guess.  One way would be if autoconf had the capability
-# to let us compile in this code only when config.guess was already
-# a possibility.
-#if test "$cross_compiling" != no; then
-#  # since we are cross-compiling, we need to check for a suitable `strip'
-#  AM_PROG_STRIP
-#  if test -z "$STRIP"; then
-#    AC_MSG_WARN([strip missing, install-strip will not strip binaries])
-#  fi
-#fi
-
-# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
-# instruct install-strip to use install-sh and the given $STRIP program.
-# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
-# as much as possible, because it's faster.
-if test -z "$STRIP"; then
-  # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-  # and the double dolard below is there to make sure that ${INSTALL}
-  # is substitued in the sub-makes, not at the top-level; this is
-  # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-  # by config.status).
-  INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-  INSTALL_STRIP_PROGRAM_ENV=''
-else
-  _am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`"
-  INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-  INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
-fi
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
 ALL_LINGUAS="cs da de el es fr gl it ja ko nl no pl pt pt_BR ru sk sl sv zh"
 
-      echo "$as_me:1362: checking for perl5.003 or newer" >&5
+      echo "$as_me:1376: checking for perl5.003 or newer" >&5
 echo $ECHO_N "checking for perl5.003 or newer... $ECHO_C" >&6
   if test "${PERL+set}" = set; then
     # `PERL' is set in the user's environment.
@@ -1383,9 +1397,9 @@ echo $ECHO_N "checking for perl5.003 or 
     fi
   done
 
-  echo "$as_me:1386: result: $found" >&5
+  echo "$as_me:1400: result: $found" >&5
 echo "${ECHO_T}$found" >&6
-  test $found = no && { echo "$as_me:1388: WARNING:
+  test $found = no && { echo "$as_me:1402: WARNING:
 WARNING: You don't seem to have perl5.003 or newer installed, or you lack
          a usable version of the Perl File::Compare module.  As a result,
          you may be unable to run a few tests or to regenerate certain
@@ -1406,7 +1420,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1409: checking for $ac_word" >&5
+echo "$as_me:1423: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1419,20 +1433,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1424: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_CC="${ac_tool_prefix}gcc"
+  echo "$as_me:1438: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_CC="${ac_tool_prefix}gcc"
+      echo "$as_me:1444: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1432: result: $CC" >&5
+  echo "$as_me:1455: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1435: result: no" >&5
+  echo "$as_me:1458: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1441,7 +1464,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1444: checking for $ac_word" >&5
+echo "$as_me:1467: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1454,20 +1477,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1459: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_ac_ct_CC="gcc"
+  echo "$as_me:1482: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_ac_ct_CC="gcc"
+      echo "$as_me:1488: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1467: result: $ac_ct_CC" >&5
+  echo "$as_me:1499: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1470: result: no" >&5
+  echo "$as_me:1502: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1480,7 +1512,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1483: checking for $ac_word" >&5
+echo "$as_me:1515: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1493,20 +1525,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1498: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_CC="${ac_tool_prefix}cc"
+  echo "$as_me:1530: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_CC="${ac_tool_prefix}cc"
+      echo "$as_me:1536: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1506: result: $CC" >&5
+  echo "$as_me:1547: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1509: result: no" >&5
+  echo "$as_me:1550: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1515,7 +1556,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1518: checking for $ac_word" >&5
+echo "$as_me:1559: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1528,20 +1569,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1533: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_ac_ct_CC="cc"
+  echo "$as_me:1574: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_ac_ct_CC="cc"
+      echo "$as_me:1580: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1541: result: $ac_ct_CC" >&5
+  echo "$as_me:1591: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1544: result: no" >&5
+  echo "$as_me:1594: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1554,7 +1604,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1557: checking for $ac_word" >&5
+echo "$as_me:1607: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1568,14 +1618,27 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
+  if $as_executable_p "$ac_dir/$ac_word"; then
 if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   ac_prog_rejected=yes
   continue
 fi
-ac_cv_prog_CC="cc"
-echo "$as_me:1577: found $ac_dir/$ac_word" >&5
-break
+  ac_cv_prog_CC="cc"
+  echo "$as_me:1627: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+     if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+      ac_cv_prog_CC="cc"
+      echo "$as_me:1637: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 if test $ac_prog_rejected = yes; then
@@ -1596,10 +1659,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1599: result: $CC" >&5
+  echo "$as_me:1662: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1602: result: no" >&5
+  echo "$as_me:1665: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1610,7 +1673,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1613: checking for $ac_word" >&5
+echo "$as_me:1676: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1623,20 +1686,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1628: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+  echo "$as_me:1691: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+      echo "$as_me:1697: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1636: result: $CC" >&5
+  echo "$as_me:1708: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1639: result: no" >&5
+  echo "$as_me:1711: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1649,7 +1721,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1652: checking for $ac_word" >&5
+echo "$as_me:1724: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1662,20 +1734,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1667: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_ac_ct_CC="$ac_prog"
+  echo "$as_me:1739: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_ac_ct_CC="$ac_prog"
+      echo "$as_me:1745: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1675: result: $ac_ct_CC" >&5
+  echo "$as_me:1756: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1678: result: no" >&5
+  echo "$as_me:1759: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1687,12 +1768,12 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1690: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1771: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1695 "configure"
+#line 1776 "configure"
 #include "confdefs.h"
 
 int
@@ -1708,13 +1789,13 @@ ac_clean_files="$ac_clean_files a.out a.
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compiler, and finding out an intuition
 # of exeext.
-echo "$as_me:1711: checking for C compiler default output" >&5
+echo "$as_me:1792: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1714: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1795: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1717: \$? = $ac_status" >&5
+  echo "$as_me:1798: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
   case $ac_file in
@@ -1731,34 +1812,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1734: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1815: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1740: result: $ac_file" >&5
+echo "$as_me:1821: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1745: checking whether the C compiler works" >&5
+echo "$as_me:1826: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1754: \$? = $ac_status" >&5
+  echo "$as_me:1835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1761: error: cannot run C compiled programs.
+	{ { echo "$as_me:1842: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1766,24 +1847,24 @@ If you meant to cross compile, use \`--h
     fi
   fi
 fi
-echo "$as_me:1769: result: yes" >&5
+echo "$as_me:1850: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1776: checking whether we are cross compiling" >&5
+echo "$as_me:1857: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1778: result: $cross_compiling" >&5
+echo "$as_me:1859: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1781: checking for executable suffix" >&5
+echo "$as_me:1862: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1786: \$? = $ac_status" >&5
+  echo "$as_me:1867: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1799,25 +1880,25 @@ for ac_file in `(ls conftest.exe; ls con
   esac
 done
 else
-  { { echo "$as_me:1802: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1883: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1808: result: $ac_cv_exeext" >&5
+echo "$as_me:1889: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1814: checking for object suffix" >&5
+echo "$as_me:1895: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1820 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 
 int
@@ -1829,10 +1910,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1835: \$? = $ac_status" >&5
+  echo "$as_me:1916: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1844,24 +1925,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1847: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1928: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1854: result: $ac_cv_objext" >&5
+echo "$as_me:1935: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1858: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1939: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1864 "configure"
+#line 1945 "configure"
 #include "confdefs.h"
 
 int
@@ -1876,16 +1957,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1882: \$? = $ac_status" >&5
+  echo "$as_me:1963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1888: \$? = $ac_status" >&5
+  echo "$as_me:1969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1897,19 +1978,19 @@ rm -f conftest.$ac_objext conftest.$ac_e
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1900: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1981: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1906: checking whether $CC accepts -g" >&5
+echo "$as_me:1987: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1912 "configure"
+#line 1993 "configure"
 #include "confdefs.h"
 
 int
@@ -1921,16 +2002,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1927: \$? = $ac_status" >&5
+  echo "$as_me:2008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1933: \$? = $ac_status" >&5
+  echo "$as_me:2014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1940,7 +2021,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1943: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2024: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1967,16 +2048,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1973: \$? = $ac_status" >&5
+  echo "$as_me:2054: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1979: \$? = $ac_status" >&5
+  echo "$as_me:2060: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1988,7 +2069,7 @@ if { (eval echo "$as_me:1970: \"$ac_comp
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1991 "configure"
+#line 2072 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2001,16 +2082,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2004: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2007: \$? = $ac_status" >&5
+  echo "$as_me:2088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2013: \$? = $ac_status" >&5
+  echo "$as_me:2094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2020,7 +2101,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2023 "configure"
+#line 2104 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2032,16 +2113,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2038: \$? = $ac_status" >&5
+  echo "$as_me:2119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2044: \$? = $ac_status" >&5
+  echo "$as_me:2125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2065,247 +2146,77 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_config_commands="$ac_config_commands default-2"
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2075: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      # Use a header file that comes with gcc, so configuring glibc
-# with a fresh cross-compiler works.
-# On the NeXT, cc -E runs the code through the compiler's parser,
-# not just through cpp. "Syntax error" is here to catch this case.
-ac_c_preproc_warn_flag=maybe
-cat >conftest.$ac_ext <<_ACEOF
-#line 2094 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax error
-_ACEOF
-if { (eval echo "$as_me:2099: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2105: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Now check whether non-existent headers can be detected and how
-# Skip if ac_cpp_err is not empty - ac_cpp is broken
-if test -z "$ac_cpp_err"; then
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2120 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:2124: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2130: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # cannot detect missing includes at all
-ac_cpp_err=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  if test "x$ac_cpp_err" = xmaybe; then
-      ac_c_preproc_warn_flag=yes
-    else
-      ac_c_preproc_warn_flag=
-    fi
-    ac_cpp_err=
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_ext
-      if test -z "$ac_cpp_err"; then
-        break
-      fi
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  # Use a header file that comes with gcc, so configuring glibc
-# with a fresh cross-compiler works.
-# On the NeXT, cc -E runs the code through the compiler's parser,
-# not just through cpp. "Syntax error" is here to catch this case.
-ac_c_preproc_warn_flag=maybe
-cat >conftest.$ac_ext <<_ACEOF
-#line 2176 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax error
-_ACEOF
-if { (eval echo "$as_me:2181: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2187: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Now check whether non-existent headers can be detected and how
-# Skip if ac_cpp_err is not empty - ac_cpp is broken
-if test -z "$ac_cpp_err"; then
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2202 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:2206: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2212: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # cannot detect missing includes at all
-ac_cpp_err=yes
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  if test "x$ac_cpp_err" = xmaybe; then
-      ac_c_preproc_warn_flag=yes
-    else
-      ac_c_preproc_warn_flag=
-    fi
-    ac_cpp_err=
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_ext
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:2245: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-if test -n "$ac_cpp_err"; then
-  { { echo "$as_me:2248: error: C preprocessor \"$CPP\" fails sanity check" >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
-# BSD make uses .include
 cat > confinc << 'END'
 doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:2265: checking for style of include used by $am_make" >&5
+echo "$as_me:2157: checking for style of include used by $am_make" >&5
 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-_am_include='#'
-for am_inc in include .include; do
-   echo "$am_inc confinc" > confmf
-   if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
-      _am_include=$am_inc
-      break
+am__include='#'
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote='"'
+      _am_result=BSD
    fi
-done
+fi
 
-echo "$as_me:2276: result: $_am_include" >&5
-echo "${ECHO_T}$_am_include" >&6
+echo "$as_me:2184: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-depcc="$CC"
-depcpp="$CPP"
+depcc="$CC"   am_compiler_list=
 
-echo "$as_me:2283: checking dependency style of $depcc" >&5
+echo "$as_me:2190: checking dependency style of $depcc" >&5
 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -z "$AMDEP"; then
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  mkdir confdir
+  mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
-  cp "$am_depcomp" confdir
-  cd confdir
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
 
   am_cv_CC_dependencies_compiler_type=none
-  for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "./depcomp"`; do
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
     echo '#include "conftest.h"' > conftest.c
     echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
-    case "$depmode" in
+    case $depmode in
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -2320,24 +2231,25 @@ else
     # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
-    if depmode="$depmode" \
+    if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1; then
-      am_cv_CC_dependencies_compiler_type="$depmode"
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_CC_dependencies_compiler_type=$depmode
       break
     fi
   done
 
   cd ..
-  rm -rf confdir
+  rm -rf conftest.dir
 else
   am_cv_CC_dependencies_compiler_type=none
 fi
 
 fi
-echo "$as_me:2340: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "$as_me:2252: result: $am_cv_CC_dependencies_compiler_type" >&5
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
@@ -2346,7 +2258,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2349: checking how to run the C preprocessor" >&5
+echo "$as_me:2261: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2359,24 +2271,27 @@ else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
-      # Use a header file that comes with gcc, so configuring glibc
-# with a fresh cross-compiler works.
-# On the NeXT, cc -E runs the code through the compiler's parser,
-# not just through cpp. "Syntax error" is here to catch this case.
-ac_c_preproc_warn_flag=maybe
-cat >conftest.$ac_ext <<_ACEOF
-#line 2368 "configure"
+      # break 2 since there is a loop in there.
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2283 "configure"
 #include "confdefs.h"
 #include <assert.h>
-Syntax error
+                     Syntax error
 _ACEOF
-if { (eval echo "$as_me:2373: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2288: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2379: \$? = $ac_status" >&5
+  echo "$as_me:2294: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2387,21 +2302,29 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # Now check whether non-existent headers can be detected and how
-# Skip if ac_cpp_err is not empty - ac_cpp is broken
-if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2394 "configure"
+#line 2317 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2398: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2321: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2404: \$? = $ac_status" >&5
+  echo "$as_me:2327: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2412,53 +2335,54 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # cannot detect missing includes at all
-ac_cpp_err=yes
+  # Broken: success on invalid input.
+continue
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  if test "x$ac_cpp_err" = xmaybe; then
-      ac_c_preproc_warn_flag=yes
-    else
-      ac_c_preproc_warn_flag=
-    fi
-    ac_cpp_err=
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 rm -f conftest.err conftest.$ac_ext
-fi
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
 
-fi
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-      if test -z "$ac_cpp_err"; then
-        break
-      fi
+if $ac_preproc_ok; then
+  break 2
+fi
+
     done
     ac_cv_prog_CPP=$CPP
 
 fi
   CPP=$ac_cv_prog_CPP
 else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:2364: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
   # Use a header file that comes with gcc, so configuring glibc
-# with a fresh cross-compiler works.
-# On the NeXT, cc -E runs the code through the compiler's parser,
-# not just through cpp. "Syntax error" is here to catch this case.
-ac_c_preproc_warn_flag=maybe
-cat >conftest.$ac_ext <<_ACEOF
-#line 2450 "configure"
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2374 "configure"
 #include "confdefs.h"
 #include <assert.h>
-Syntax error
+                     Syntax error
 _ACEOF
-if { (eval echo "$as_me:2455: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2379: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2461: \$? = $ac_status" >&5
+  echo "$as_me:2385: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2469,21 +2393,29 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # Now check whether non-existent headers can be detected and how
-# Skip if ac_cpp_err is not empty - ac_cpp is broken
-if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2476 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2480: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2412: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2486: \$? = $ac_status" >&5
+  echo "$as_me:2418: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2494,35 +2426,28 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # cannot detect missing includes at all
-ac_cpp_err=yes
+  # Broken: success on invalid input.
+continue
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  if test "x$ac_cpp_err" = xmaybe; then
-      ac_c_preproc_warn_flag=yes
-    else
-      ac_c_preproc_warn_flag=
-    fi
-    ac_cpp_err=
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 rm -f conftest.err conftest.$ac_ext
-fi
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
 
-fi
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:2519: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-if test -n "$ac_cpp_err"; then
-  { { echo "$as_me:2522: error: C preprocessor \"$CPP\" fails sanity check" >&5
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:2446: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2530,14 +2455,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2533: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2458: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 2540 "configure"
+#line 2465 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -2552,7 +2477,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2555 "configure"
+#line 2480 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -2565,7 +2490,7 @@ rm -f conftest*
 
   fi
 fi
-echo "$as_me:2568: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2493: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
@@ -2575,7 +2500,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2578: checking for $ac_word" >&5
+echo "$as_me:2503: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2588,20 +2513,29 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2593: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+  echo "$as_me:2518: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+      echo "$as_me:2524: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2601: result: $RANLIB" >&5
+  echo "$as_me:2535: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2604: result: no" >&5
+  echo "$as_me:2538: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2610,7 +2544,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2613: checking for $ac_word" >&5
+echo "$as_me:2547: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2623,10 +2557,19 @@ ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2628: found $ac_dir/$ac_word" >&5
-break
+  if $as_executable_p "$ac_dir/$ac_word"; then
+  ac_cv_prog_ac_ct_RANLIB="ranlib"
+  echo "$as_me:2562: found $ac_dir/$ac_word" >&5
+  break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_prog_ac_ct_RANLIB="ranlib"
+      echo "$as_me:2568: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
+fi
 done
 
   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
@@ -2634,10 +2577,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2637: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2580: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2640: result: no" >&5
+  echo "$as_me:2583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2646,10 +2589,10 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:2649: checking for AIX" >&5
+echo "$as_me:2592: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2652 "configure"
+#line 2595 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2658,35 +2601,35 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2661: result: yes" >&5
+  echo "$as_me:2604: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2668: result: no" >&5
+  echo "$as_me:2611: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2673: checking for minix/config.h" >&5
+echo "$as_me:2616: checking for minix/config.h" >&5
 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2679 "configure"
+#line 2622 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 _ACEOF
-if { (eval echo "$as_me:2683: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2626: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2689: \$? = $ac_status" >&5
+  echo "$as_me:2632: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2705,7 +2648,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2708: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2651: result: $ac_cv_header_minix_config_h" >&5
 echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
 if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes
@@ -2729,7 +2672,7 @@ EOF
 
 fi
 
-        echo "$as_me:2732: checking for strerror in -lcposix" >&5
+        echo "$as_me:2675: checking for strerror in -lcposix" >&5
 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2737,7 +2680,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2740 "configure"
+#line 2683 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2756,16 +2699,16 @@ strerror ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2762: \$? = $ac_status" >&5
+  echo "$as_me:2705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2768: \$? = $ac_status" >&5
+  echo "$as_me:2711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_strerror=yes
 else
@@ -2776,7 +2719,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2779: result: $ac_cv_lib_cposix_strerror" >&5
+echo "$as_me:2722: result: $ac_cv_lib_cposix_strerror" >&5
 echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
 if test $ac_cv_lib_cposix_strerror = yes; then
   LIBS="$LIBS -lcposix"
@@ -2802,7 +2745,7 @@ if test "${enable_largefile+set}" = set;
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:2805: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:2748: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2814,7 +2757,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 2817 "configure"
+#line 2760 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -2834,16 +2777,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2840: \$? = $ac_status" >&5
+  echo "$as_me:2783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2846: \$? = $ac_status" >&5
+  echo "$as_me:2789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2853,16 +2796,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2859: \$? = $ac_status" >&5
+  echo "$as_me:2802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2865: \$? = $ac_status" >&5
+  echo "$as_me:2808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -2876,13 +2819,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:2879: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:2822: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:2885: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:2828: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2890,7 +2833,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 2893 "configure"
+#line 2836 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -2910,16 +2853,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2913: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2916: \$? = $ac_status" >&5
+  echo "$as_me:2859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2922: \$? = $ac_status" >&5
+  echo "$as_me:2865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2928,7 +2871,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2931 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -2949,16 +2892,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2955: \$? = $ac_status" >&5
+  echo "$as_me:2898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2961: \$? = $ac_status" >&5
+  echo "$as_me:2904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -2969,7 +2912,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
   break
 done
 fi
-echo "$as_me:2972: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:2915: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -2979,7 +2922,7 @@ EOF
 
 fi
 rm -f conftest*
-  echo "$as_me:2982: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:2925: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2987,7 +2930,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 2990 "configure"
+#line 2933 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3007,16 +2950,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3013: \$? = $ac_status" >&5
+  echo "$as_me:2956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3019: \$? = $ac_status" >&5
+  echo "$as_me:2962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3025,7 +2968,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3028 "configure"
+#line 2971 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3046,16 +2989,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3052: \$? = $ac_status" >&5
+  echo "$as_me:2995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3058: \$? = $ac_status" >&5
+  echo "$as_me:3001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -3066,7 +3009,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
   break
 done
 fi
-echo "$as_me:3069: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:3012: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -3078,7 +3021,7 @@ fi
 rm -f conftest*
 fi
 
-echo "$as_me:3081: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:3024: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${am_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3096,7 +3039,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<_ACEOF
-#line 3099 "configure"
+#line 3042 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3138,16 +3081,16 @@ return f (e, argv, 0) != argv[0]  ||  f 
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3144: \$? = $ac_status" >&5
+  echo "$as_me:3087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3150: \$? = $ac_status" >&5
+  echo "$as_me:3093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -3161,10 +3104,10 @@ CC="$ac_save_CC"
 fi
 
 if test -z "$am_cv_prog_cc_stdc"; then
-  echo "$as_me:3164: result: none needed" >&5
+  echo "$as_me:3107: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6
 else
-  echo "$as_me:3167: result: $am_cv_prog_cc_stdc" >&5
+  echo "$as_me:3110: result: $am_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
 fi
 case "x$am_cv_prog_cc_stdc" in
@@ -3172,10 +3115,10 @@ case "x$am_cv_prog_cc_stdc" in
   *) CC="$CC $am_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3175: checking for function prototypes" >&5
+echo "$as_me:3118: checking for function prototypes" >&5
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
-  echo "$as_me:3178: result: yes" >&5
+  echo "$as_me:3121: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -3184,18 +3127,18 @@ EOF
 
   U= ANSI2KNR=
 else
-  echo "$as_me:3187: result: no" >&5
+  echo "$as_me:3130: result: no" >&5
 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
 fi
 # Ensure some checks needed by ansi2knr itself.
-echo "$as_me:3192: checking for ANSI C header files" >&5
+echo "$as_me:3135: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3198 "configure"
+#line 3141 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3203,13 +3146,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:3206: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3149: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3212: \$? = $ac_status" >&5
+  echo "$as_me:3155: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3231,7 +3174,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3234 "configure"
+#line 3177 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3249,7 +3192,7 @@ fi
 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 <<_ACEOF
-#line 3252 "configure"
+#line 3195 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3270,7 +3213,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3273 "configure"
+#line 3216 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3296,15 +3239,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3302: \$? = $ac_status" >&5
+  echo "$as_me:3245: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3307: \$? = $ac_status" >&5
+  echo "$as_me:3250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3313,11 +3256,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:3320: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3263: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -3330,23 +3273,23 @@ fi
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3333: checking for $ac_header" >&5
+echo "$as_me:3276: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3339 "configure"
+#line 3282 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3343: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3286: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3349: \$? = $ac_status" >&5
+  echo "$as_me:3292: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3365,7 +3308,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3368: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3311: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3375,7 +3318,7 @@ EOF
 fi
 done
 
-echo "$as_me:3378: checking whether byte ordering is bigendian" >&5
+echo "$as_me:3321: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3383,7 +3326,7 @@ else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line 3386 "configure"
+#line 3329 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3400,20 +3343,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3406: \$? = $ac_status" >&5
+  echo "$as_me:3349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3412: \$? = $ac_status" >&5
+  echo "$as_me:3355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line 3416 "configure"
+#line 3359 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3430,16 +3373,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3436: \$? = $ac_status" >&5
+  echo "$as_me:3379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3442: \$? = $ac_status" >&5
+  echo "$as_me:3385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -3455,12 +3398,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3458: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3401: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3463 "configure"
+#line 3406 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -3476,15 +3419,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3482: \$? = $ac_status" >&5
+  echo "$as_me:3425: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3487: \$? = $ac_status" >&5
+  echo "$as_me:3430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
@@ -3493,11 +3436,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_c_bigendian=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:3500: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:3443: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
 
@@ -3507,7 +3450,7 @@ EOF
 
 fi
 
-echo "$as_me:3510: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3453: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3515,7 +3458,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 3518 "configure"
+#line 3461 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3564,16 +3507,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3570: \$? = $ac_status" >&5
+  echo "$as_me:3513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3576: \$? = $ac_status" >&5
+  echo "$as_me:3519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3590,21 +3533,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:3593: result: none needed" >&5
+    echo "$as_me:3536: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:3596: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3539: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3601: checking for an ANSI C-conforming const" >&5
+echo "$as_me:3544: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3607 "configure"
+#line 3550 "configure"
 #include "confdefs.h"
 
 int
@@ -3662,16 +3605,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3668: \$? = $ac_status" >&5
+  echo "$as_me:3611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3674: \$? = $ac_status" >&5
+  echo "$as_me:3617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3681,7 +3624,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3684: result: $ac_cv_c_const" >&5
+echo "$as_me:3627: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3691,13 +3634,13 @@ EOF
 
 fi
 
-echo "$as_me:3694: checking for working volatile" >&5
+echo "$as_me:3637: checking for working volatile" >&5
 echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
 if test "${ac_cv_c_volatile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3700 "configure"
+#line 3643 "configure"
 #include "confdefs.h"
 
 int
@@ -3711,16 +3654,16 @@ int * volatile y;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3717: \$? = $ac_status" >&5
+  echo "$as_me:3660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3723: \$? = $ac_status" >&5
+  echo "$as_me:3666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_volatile=yes
 else
@@ -3730,7 +3673,7 @@ ac_cv_c_volatile=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3733: result: $ac_cv_c_volatile" >&5
+echo "$as_me:3676: result: $ac_cv_c_volatile" >&5
 echo "${ECHO_T}$ac_cv_c_volatile" >&6
 if test $ac_cv_c_volatile = no; then
 
@@ -3740,7 +3683,7 @@ EOF
 
 fi
 
-echo "$as_me:3743: checking for inline" >&5
+echo "$as_me:3686: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3748,7 +3691,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 3751 "configure"
+#line 3694 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -3757,16 +3700,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3763: \$? = $ac_status" >&5
+  echo "$as_me:3706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3769: \$? = $ac_status" >&5
+  echo "$as_me:3712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3777,7 +3720,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
 done
 
 fi
-echo "$as_me:3780: result: $ac_cv_c_inline" >&5
+echo "$as_me:3723: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -3792,7 +3735,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:3795: checking for long double" >&5
+echo "$as_me:3738: checking for long double" >&5
 echo $ECHO_N "checking for long double... $ECHO_C" >&6
 if test "${ac_cv_c_long_double+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3801,12 +3744,12 @@ else
   ac_cv_c_long_double=yes
 else
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3804: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3747: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3809 "configure"
+#line 3752 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -3819,15 +3762,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3825: \$? = $ac_status" >&5
+  echo "$as_me:3768: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3830: \$? = $ac_status" >&5
+  echo "$as_me:3773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_long_double=yes
 else
@@ -3836,11 +3779,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_c_long_double=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:3843: result: $ac_cv_c_long_double" >&5
+echo "$as_me:3786: result: $ac_cv_c_long_double" >&5
 echo "${ECHO_T}$ac_cv_c_long_double" >&6
 if test $ac_cv_c_long_double = yes; then
 
@@ -3891,23 +3834,23 @@ for ac_header in \
 
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3894: checking for $ac_header" >&5
+echo "$as_me:3837: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3900 "configure"
+#line 3843 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3904: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3847: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3910: \$? = $ac_status" >&5
+  echo "$as_me:3853: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3926,7 +3869,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3929: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3872: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3939,13 +3882,13 @@ done
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   ac_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $ac_tr_sh`
-echo "$as_me:3942: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:3885: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3948 "configure"
+#line 3891 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3959,16 +3902,16 @@ DIR *dirp = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3965: \$? = $ac_status" >&5
+  echo "$as_me:3908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3971: \$? = $ac_status" >&5
+  echo "$as_me:3914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_Header=yes"
 else
@@ -3978,7 +3921,7 @@ eval "$ac_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3981: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:3924: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3991,7 +3934,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:3994: checking for opendir in -ldir" >&5
+  echo "$as_me:3937: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3999,7 +3942,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4002 "configure"
+#line 3945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4018,16 +3961,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4024: \$? = $ac_status" >&5
+  echo "$as_me:3967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4030: \$? = $ac_status" >&5
+  echo "$as_me:3973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -4038,14 +3981,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4041: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:3984: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:4048: checking for opendir in -lx" >&5
+  echo "$as_me:3991: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4053,7 +3996,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4056 "configure"
+#line 3999 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4072,16 +4015,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4078: \$? = $ac_status" >&5
+  echo "$as_me:4021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4084: \$? = $ac_status" >&5
+  echo "$as_me:4027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -4092,7 +4035,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4095: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:4038: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -4103,23 +4046,23 @@ fi
 for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4106: checking for $ac_header" >&5
+echo "$as_me:4049: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4112 "configure"
+#line 4055 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4116: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4059: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4122: \$? = $ac_status" >&5
+  echo "$as_me:4065: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4138,7 +4081,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4141: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:4084: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4148,13 +4091,13 @@ EOF
 fi
 done
 
-echo "$as_me:4151: checking for struct stat.st_blocks" >&5
+echo "$as_me:4094: checking for struct stat.st_blocks" >&5
 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4157 "configure"
+#line 4100 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4167,16 +4110,16 @@ foo.st_blocks;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4113: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4173: \$? = $ac_status" >&5
+  echo "$as_me:4116: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4179: \$? = $ac_status" >&5
+  echo "$as_me:4122: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
@@ -4186,7 +4129,7 @@ ac_cv_member_struct_stat_st_blocks=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4189: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "$as_me:4132: result: $ac_cv_member_struct_stat_st_blocks" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
 if test $ac_cv_member_struct_stat_st_blocks = yes; then
 
@@ -4202,13 +4145,13 @@ else
   LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
 fi
 
-echo "$as_me:4205: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:4148: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4211 "configure"
+#line 4154 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4222,16 +4165,16 @@ struct tm *tp; tp->tm_sec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4228: \$? = $ac_status" >&5
+  echo "$as_me:4171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4234: \$? = $ac_status" >&5
+  echo "$as_me:4177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -4241,7 +4184,7 @@ ac_cv_struct_tm=sys/time.h
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4244: result: $ac_cv_struct_tm" >&5
+echo "$as_me:4187: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -4251,13 +4194,13 @@ EOF
 
 fi
 
-echo "$as_me:4254: checking for struct tm.tm_zone" >&5
+echo "$as_me:4197: checking for struct tm.tm_zone" >&5
 echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4260 "configure"
+#line 4203 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4272,16 +4215,16 @@ foo.tm_zone;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4278: \$? = $ac_status" >&5
+  echo "$as_me:4221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4284: \$? = $ac_status" >&5
+  echo "$as_me:4227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
@@ -4291,7 +4234,7 @@ ac_cv_member_struct_tm_tm_zone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4294: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "$as_me:4237: result: $ac_cv_member_struct_tm_tm_zone" >&5
 echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
 if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
@@ -4308,13 +4251,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-  echo "$as_me:4311: checking for tzname" >&5
+  echo "$as_me:4254: checking for tzname" >&5
 echo $ECHO_N "checking for tzname... $ECHO_C" >&6
 if test "${ac_cv_var_tzname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4317 "configure"
+#line 4260 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4330,16 +4273,16 @@ atoi(*tzname);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4336: \$? = $ac_status" >&5
+  echo "$as_me:4279: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4342: \$? = $ac_status" >&5
+  echo "$as_me:4285: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_var_tzname=yes
 else
@@ -4349,7 +4292,7 @@ ac_cv_var_tzname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4352: result: $ac_cv_var_tzname" >&5
+echo "$as_me:4295: result: $ac_cv_var_tzname" >&5
 echo "${ECHO_T}$ac_cv_var_tzname" >&6
   if test $ac_cv_var_tzname = yes; then
 
@@ -4360,13 +4303,13 @@ EOF
   fi
 fi
 
-echo "$as_me:4363: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:4306: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4369 "configure"
+#line 4312 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4405,7 +4348,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4408: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:4351: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -4415,7 +4358,7 @@ EOF
 
 fi
 
-echo "$as_me:4418: checking for nanoseconds member of struct stat.st_mtim" >&5
+echo "$as_me:4361: checking for nanoseconds member of struct stat.st_mtim" >&5
 echo $ECHO_N "checking for nanoseconds member of struct stat.st_mtim... $ECHO_C" >&6
 if test "${ac_cv_struct_st_mtim_nsec+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4430,7 +4373,7 @@ else
     for ac_val in tv_nsec _tv_nsec st__tim.tv_nsec; do
       CPPFLAGS="$ac_save_CPPFLAGS -DST_MTIM_NSEC=$ac_val"
       cat >conftest.$ac_ext <<_ACEOF
-#line 4433 "configure"
+#line 4376 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4443,16 +4386,16 @@ struct stat s; s.st_mtim.ST_MTIM_NSEC;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4449: \$? = $ac_status" >&5
+  echo "$as_me:4392: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4455: \$? = $ac_status" >&5
+  echo "$as_me:4398: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_st_mtim_nsec=$ac_val; break
 else
@@ -4463,7 +4406,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
     done
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-echo "$as_me:4466: result: $ac_cv_struct_st_mtim_nsec" >&5
+echo "$as_me:4409: result: $ac_cv_struct_st_mtim_nsec" >&5
 echo "${ECHO_T}$ac_cv_struct_st_mtim_nsec" >&6
 
   if test $ac_cv_struct_st_mtim_nsec != no; then
@@ -4474,13 +4417,13 @@ EOF
 
   fi
 
-echo "$as_me:4477: checking for st_dm_mode in struct stat" >&5
+echo "$as_me:4420: checking for st_dm_mode in struct stat" >&5
 echo $ECHO_N "checking for st_dm_mode in struct stat... $ECHO_C" >&6
 if test "${ac_cv_struct_st_dm_mode+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4483 "configure"
+#line 4426 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4493,16 +4436,16 @@ struct stat s; s.st_dm_mode;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4499: \$? = $ac_status" >&5
+  echo "$as_me:4442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4505: \$? = $ac_status" >&5
+  echo "$as_me:4448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_st_dm_mode=yes
 else
@@ -4512,7 +4455,7 @@ ac_cv_struct_st_dm_mode=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4515: result: $ac_cv_struct_st_dm_mode" >&5
+echo "$as_me:4458: result: $ac_cv_struct_st_dm_mode" >&5
 echo "${ECHO_T}$ac_cv_struct_st_dm_mode" >&6
 
   if test $ac_cv_struct_st_dm_mode = yes; then
@@ -4523,13 +4466,13 @@ EOF
 
   fi
 
-echo "$as_me:4526: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:4469: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4532 "configure"
+#line 4475 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4544,16 +4487,16 @@ struct tm *tp;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4550: \$? = $ac_status" >&5
+  echo "$as_me:4493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4556: \$? = $ac_status" >&5
+  echo "$as_me:4499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -4563,7 +4506,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4566: result: $ac_cv_header_time" >&5
+echo "$as_me:4509: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -4573,13 +4516,13 @@ EOF
 
 fi
 
-  echo "$as_me:4576: checking for struct timespec" >&5
+  echo "$as_me:4519: checking for struct timespec" >&5
 echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6
 if test "${fu_cv_sys_struct_timespec+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4582 "configure"
+#line 4525 "configure"
 #include "confdefs.h"
 
 #      if TIME_WITH_SYS_TIME
@@ -4602,16 +4545,16 @@ static struct timespec x; x.tv_sec = x.t
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4608: \$? = $ac_status" >&5
+  echo "$as_me:4551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4614: \$? = $ac_status" >&5
+  echo "$as_me:4557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_struct_timespec=yes
 else
@@ -4622,7 +4565,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4625: result: $fu_cv_sys_struct_timespec" >&5
+echo "$as_me:4568: result: $fu_cv_sys_struct_timespec" >&5
 echo "${ECHO_T}$fu_cv_sys_struct_timespec" >&6
 
   if test $fu_cv_sys_struct_timespec = yes; then
@@ -4633,13 +4576,13 @@ EOF
 
   fi
 
-echo "$as_me:4636: checking for uid_t in sys/types.h" >&5
+echo "$as_me:4579: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4642 "configure"
+#line 4585 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -4653,7 +4596,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4656: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:4599: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -4667,7 +4610,7 @@ EOF
 
 fi
 
-echo "$as_me:4670: checking type of array argument to getgroups" >&5
+echo "$as_me:4613: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4676,7 +4619,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4679 "configure"
+#line 4622 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -4702,15 +4645,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4708: \$? = $ac_status" >&5
+  echo "$as_me:4651: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4713: \$? = $ac_status" >&5
+  echo "$as_me:4656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -4719,11 +4662,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_type_getgroups=int
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 4726 "configure"
+#line 4669 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -4738,20 +4681,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:4741: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:4684: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:4748: checking for mode_t" >&5
+echo "$as_me:4691: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4754 "configure"
+#line 4697 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4766,16 +4709,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4772: \$? = $ac_status" >&5
+  echo "$as_me:4715: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4778: \$? = $ac_status" >&5
+  echo "$as_me:4721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -4785,7 +4728,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4788: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:4731: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -4797,13 +4740,13 @@ EOF
 
 fi
 
-echo "$as_me:4800: checking for off_t" >&5
+echo "$as_me:4743: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4806 "configure"
+#line 4749 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4818,16 +4761,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4824: \$? = $ac_status" >&5
+  echo "$as_me:4767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4830: \$? = $ac_status" >&5
+  echo "$as_me:4773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -4837,7 +4780,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4840: result: $ac_cv_type_off_t" >&5
+echo "$as_me:4783: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -4849,13 +4792,13 @@ EOF
 
 fi
 
-echo "$as_me:4852: checking for pid_t" >&5
+echo "$as_me:4795: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4858 "configure"
+#line 4801 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4870,16 +4813,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4873: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4876: \$? = $ac_status" >&5
+  echo "$as_me:4819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4882: \$? = $ac_status" >&5
+  echo "$as_me:4825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -4889,7 +4832,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4892: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:4835: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -4901,13 +4844,13 @@ EOF
 
 fi
 
-echo "$as_me:4904: checking return type of signal handlers" >&5
+echo "$as_me:4847: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4910 "configure"
+#line 4853 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4929,16 +4872,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4935: \$? = $ac_status" >&5
+  echo "$as_me:4878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4941: \$? = $ac_status" >&5
+  echo "$as_me:4884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -4948,20 +4891,20 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4951: result: $ac_cv_type_signal" >&5
+echo "$as_me:4894: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 
-echo "$as_me:4958: checking for size_t" >&5
+echo "$as_me:4901: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4964 "configure"
+#line 4907 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4976,16 +4919,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4982: \$? = $ac_status" >&5
+  echo "$as_me:4925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4988: \$? = $ac_status" >&5
+  echo "$as_me:4931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4995,7 +4938,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4998: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4941: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -5007,13 +4950,13 @@ EOF
 
 fi
 
-  echo "$as_me:5010: checking for inttypes.h" >&5
+  echo "$as_me:4953: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5016 "configure"
+#line 4959 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -5026,16 +4969,16 @@ uintmax_t i = (uintmax_t) -1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5032: \$? = $ac_status" >&5
+  echo "$as_me:4975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5038: \$? = $ac_status" >&5
+  echo "$as_me:4981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_header_inttypes_h=yes
 else
@@ -5045,7 +4988,7 @@ jm_ac_cv_header_inttypes_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5048: result: $jm_ac_cv_header_inttypes_h" >&5
+echo "$as_me:4991: result: $jm_ac_cv_header_inttypes_h" >&5
 echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
   if test $jm_ac_cv_header_inttypes_h = yes; then
 
@@ -5055,13 +4998,13 @@ EOF
 
   fi
 
-  echo "$as_me:5058: checking for unsigned long long" >&5
+  echo "$as_me:5001: checking for unsigned long long" >&5
 echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
 if test "${ac_cv_type_unsigned_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5064 "configure"
+#line 5007 "configure"
 #include "confdefs.h"
 unsigned long long ull = 1; int i = 63;
 int
@@ -5074,16 +5017,16 @@ unsigned long long ullmax = (unsigned lo
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5080: \$? = $ac_status" >&5
+  echo "$as_me:5023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5086: \$? = $ac_status" >&5
+  echo "$as_me:5029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_unsigned_long_long=yes
 else
@@ -5093,7 +5036,7 @@ ac_cv_type_unsigned_long_long=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5096: result: $ac_cv_type_unsigned_long_long" >&5
+echo "$as_me:5039: result: $ac_cv_type_unsigned_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
   if test $ac_cv_type_unsigned_long_long = yes; then
 
@@ -5115,13 +5058,13 @@ EOF
 
   fi
 
-echo "$as_me:5118: checking whether sys/types.h defines makedev" >&5
+echo "$as_me:5061: checking whether sys/types.h defines makedev" >&5
 echo $ECHO_N "checking whether sys/types.h defines makedev... $ECHO_C" >&6
 if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5124 "configure"
+#line 5067 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5134,16 +5077,16 @@ return makedev(0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5140: \$? = $ac_status" >&5
+  echo "$as_me:5083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5146: \$? = $ac_status" >&5
+  echo "$as_me:5089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_sys_types_h_makedev=yes
 else
@@ -5154,27 +5097,27 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5157: result: $ac_cv_header_sys_types_h_makedev" >&5
+echo "$as_me:5100: result: $ac_cv_header_sys_types_h_makedev" >&5
 echo "${ECHO_T}$ac_cv_header_sys_types_h_makedev" >&6
 
 if test $ac_cv_header_sys_types_h_makedev = no; then
-echo "$as_me:5161: checking for sys/mkdev.h" >&5
+echo "$as_me:5104: checking for sys/mkdev.h" >&5
 echo $ECHO_N "checking for sys/mkdev.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_mkdev_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5167 "configure"
+#line 5110 "configure"
 #include "confdefs.h"
 #include <sys/mkdev.h>
 _ACEOF
-if { (eval echo "$as_me:5171: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5114: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5177: \$? = $ac_status" >&5
+  echo "$as_me:5120: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5193,7 +5136,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5196: result: $ac_cv_header_sys_mkdev_h" >&5
+echo "$as_me:5139: result: $ac_cv_header_sys_mkdev_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_mkdev_h" >&6
 if test $ac_cv_header_sys_mkdev_h = yes; then
 
@@ -5204,23 +5147,23 @@ EOF
 fi
 
   if test $ac_cv_header_sys_mkdev_h = no; then
-    echo "$as_me:5207: checking for sys/sysmacros.h" >&5
+    echo "$as_me:5150: checking for sys/sysmacros.h" >&5
 echo $ECHO_N "checking for sys/sysmacros.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5213 "configure"
+#line 5156 "configure"
 #include "confdefs.h"
 #include <sys/sysmacros.h>
 _ACEOF
-if { (eval echo "$as_me:5217: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5160: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5223: \$? = $ac_status" >&5
+  echo "$as_me:5166: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5239,7 +5182,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5242: result: $ac_cv_header_sys_sysmacros_h" >&5
+echo "$as_me:5185: result: $ac_cv_header_sys_sysmacros_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_sysmacros_h" >&6
 if test $ac_cv_header_sys_sysmacros_h = yes; then
 
@@ -5255,12 +5198,12 @@ fi
   # getdate.y works with bison only.
   : ${YACC='bison -y'}
 
-  echo "$as_me:5258: checking whether to enable assertions" >&5
+  echo "$as_me:5201: checking whether to enable assertions" >&5
 echo $ECHO_N "checking whether to enable assertions... $ECHO_C" >&6
   # Check whether --enable-assert or --disable-assert was given.
 if test "${enable_assert+set}" = set; then
   enableval="$enable_assert"
-   echo "$as_me:5263: result: no" >&5
+   echo "$as_me:5206: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cat >>confdefs.h <<\EOF
@@ -5268,7 +5211,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-   echo "$as_me:5271: result: yes" >&5
+   echo "$as_me:5214: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 fi;
@@ -5276,23 +5219,23 @@ fi;
 for ac_header in utime.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5279: checking for $ac_header" >&5
+echo "$as_me:5222: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5285 "configure"
+#line 5228 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5289: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5232: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5295: \$? = $ac_status" >&5
+  echo "$as_me:5238: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5311,7 +5254,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5314: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:5257: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5321,13 +5264,13 @@ EOF
 fi
 done
 
-  echo "$as_me:5324: checking for struct utimbuf" >&5
+  echo "$as_me:5267: checking for struct utimbuf" >&5
 echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6
 if test "${fu_cv_sys_struct_utimbuf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5330 "configure"
+#line 5273 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -5353,16 +5296,16 @@ static struct utimbuf x; x.actime = x.mo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5299: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5359: \$? = $ac_status" >&5
+  echo "$as_me:5302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5365: \$? = $ac_status" >&5
+  echo "$as_me:5308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_struct_utimbuf=yes
 else
@@ -5373,7 +5316,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5376: result: $fu_cv_sys_struct_utimbuf" >&5
+echo "$as_me:5319: result: $fu_cv_sys_struct_utimbuf" >&5
 echo "${ECHO_T}$fu_cv_sys_struct_utimbuf" >&6
 
   if test $fu_cv_sys_struct_utimbuf = yes; then
@@ -5384,13 +5327,13 @@ EOF
 
   fi
 
-   echo "$as_me:5387: checking for d_type member in directory struct" >&5
+   echo "$as_me:5330: checking for d_type member in directory struct" >&5
 echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6
 if test "${jm_cv_struct_dirent_d_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5393 "configure"
+#line 5336 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5418,16 +5361,16 @@ struct dirent dp; dp.d_type = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5424: \$? = $ac_status" >&5
+  echo "$as_me:5367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5430: \$? = $ac_status" >&5
+  echo "$as_me:5373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_struct_dirent_d_type=yes
 else
@@ -5438,7 +5381,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5441: result: $jm_cv_struct_dirent_d_type" >&5
+echo "$as_me:5384: result: $jm_cv_struct_dirent_d_type" >&5
 echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6
    if test $jm_cv_struct_dirent_d_type = yes; then
 
@@ -5448,13 +5391,13 @@ EOF
 
    fi
 
-   echo "$as_me:5451: checking for d_ino member in directory struct" >&5
+   echo "$as_me:5394: checking for d_ino member in directory struct" >&5
 echo $ECHO_N "checking for d_ino member in directory struct... $ECHO_C" >&6
 if test "${jm_cv_struct_dirent_d_ino+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5457 "configure"
+#line 5400 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5482,16 +5425,16 @@ struct dirent dp; dp.d_ino = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5488: \$? = $ac_status" >&5
+  echo "$as_me:5431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5494: \$? = $ac_status" >&5
+  echo "$as_me:5437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_struct_dirent_d_ino=yes
 else
@@ -5502,7 +5445,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5505: result: $jm_cv_struct_dirent_d_ino" >&5
+echo "$as_me:5448: result: $jm_cv_struct_dirent_d_ino" >&5
 echo "${ECHO_T}$jm_cv_struct_dirent_d_ino" >&6
    if test $jm_cv_struct_dirent_d_ino = yes; then
 
@@ -5516,23 +5459,23 @@ for ac_header in grp.h memory.h pwd.h st
                    unistd.h sys/time.h utmp.h utmpx.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5519: checking for $ac_header" >&5
+echo "$as_me:5462: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5525 "configure"
+#line 5468 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5529: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5472: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5535: \$? = $ac_status" >&5
+  echo "$as_me:5478: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5551,7 +5494,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5554: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:5497: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5605,13 +5548,13 @@ done
 #endif
 '
 
-  echo "$as_me:5608: checking whether free is declared" >&5
+  echo "$as_me:5551: checking whether free is declared" >&5
 echo $ECHO_N "checking whether free is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5614 "configure"
+#line 5557 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5627,16 +5570,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5633: \$? = $ac_status" >&5
+  echo "$as_me:5576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5639: \$? = $ac_status" >&5
+  echo "$as_me:5582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_free=yes
 else
@@ -5646,7 +5589,7 @@ ac_cv_have_decl_free=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5649: result: $ac_cv_have_decl_free" >&5
+echo "$as_me:5592: result: $ac_cv_have_decl_free" >&5
 echo "${ECHO_T}$ac_cv_have_decl_free" >&6
 if test $ac_cv_have_decl_free = yes; then
 
@@ -5660,13 +5603,13 @@ else
 EOF
 
 fi
-echo "$as_me:5663: checking whether getenv is declared" >&5
+echo "$as_me:5606: checking whether getenv is declared" >&5
 echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5669 "configure"
+#line 5612 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5682,16 +5625,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5688: \$? = $ac_status" >&5
+  echo "$as_me:5631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5694: \$? = $ac_status" >&5
+  echo "$as_me:5637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getenv=yes
 else
@@ -5701,7 +5644,7 @@ ac_cv_have_decl_getenv=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5704: result: $ac_cv_have_decl_getenv" >&5
+echo "$as_me:5647: result: $ac_cv_have_decl_getenv" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6
 if test $ac_cv_have_decl_getenv = yes; then
 
@@ -5715,13 +5658,13 @@ else
 EOF
 
 fi
-echo "$as_me:5718: checking whether geteuid is declared" >&5
+echo "$as_me:5661: checking whether geteuid is declared" >&5
 echo $ECHO_N "checking whether geteuid is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_geteuid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5724 "configure"
+#line 5667 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5737,16 +5680,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5743: \$? = $ac_status" >&5
+  echo "$as_me:5686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5749: \$? = $ac_status" >&5
+  echo "$as_me:5692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_geteuid=yes
 else
@@ -5756,7 +5699,7 @@ ac_cv_have_decl_geteuid=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5759: result: $ac_cv_have_decl_geteuid" >&5
+echo "$as_me:5702: result: $ac_cv_have_decl_geteuid" >&5
 echo "${ECHO_T}$ac_cv_have_decl_geteuid" >&6
 if test $ac_cv_have_decl_geteuid = yes; then
 
@@ -5770,13 +5713,13 @@ else
 EOF
 
 fi
-echo "$as_me:5773: checking whether getgrgid is declared" >&5
+echo "$as_me:5716: checking whether getgrgid is declared" >&5
 echo $ECHO_N "checking whether getgrgid is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getgrgid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5779 "configure"
+#line 5722 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5792,16 +5735,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5798: \$? = $ac_status" >&5
+  echo "$as_me:5741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5804: \$? = $ac_status" >&5
+  echo "$as_me:5747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getgrgid=yes
 else
@@ -5811,7 +5754,7 @@ ac_cv_have_decl_getgrgid=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5814: result: $ac_cv_have_decl_getgrgid" >&5
+echo "$as_me:5757: result: $ac_cv_have_decl_getgrgid" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getgrgid" >&6
 if test $ac_cv_have_decl_getgrgid = yes; then
 
@@ -5825,13 +5768,13 @@ else
 EOF
 
 fi
-echo "$as_me:5828: checking whether getlogin is declared" >&5
+echo "$as_me:5771: checking whether getlogin is declared" >&5
 echo $ECHO_N "checking whether getlogin is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getlogin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5834 "configure"
+#line 5777 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5847,16 +5790,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5853: \$? = $ac_status" >&5
+  echo "$as_me:5796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5859: \$? = $ac_status" >&5
+  echo "$as_me:5802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getlogin=yes
 else
@@ -5866,7 +5809,7 @@ ac_cv_have_decl_getlogin=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5869: result: $ac_cv_have_decl_getlogin" >&5
+echo "$as_me:5812: result: $ac_cv_have_decl_getlogin" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getlogin" >&6
 if test $ac_cv_have_decl_getlogin = yes; then
 
@@ -5880,13 +5823,13 @@ else
 EOF
 
 fi
-echo "$as_me:5883: checking whether getpwuid is declared" >&5
+echo "$as_me:5826: checking whether getpwuid is declared" >&5
 echo $ECHO_N "checking whether getpwuid is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getpwuid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5889 "configure"
+#line 5832 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5902,16 +5845,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5908: \$? = $ac_status" >&5
+  echo "$as_me:5851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5914: \$? = $ac_status" >&5
+  echo "$as_me:5857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getpwuid=yes
 else
@@ -5921,7 +5864,7 @@ ac_cv_have_decl_getpwuid=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5924: result: $ac_cv_have_decl_getpwuid" >&5
+echo "$as_me:5867: result: $ac_cv_have_decl_getpwuid" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getpwuid" >&6
 if test $ac_cv_have_decl_getpwuid = yes; then
 
@@ -5935,13 +5878,13 @@ else
 EOF
 
 fi
-echo "$as_me:5938: checking whether getuid is declared" >&5
+echo "$as_me:5881: checking whether getuid is declared" >&5
 echo $ECHO_N "checking whether getuid is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getuid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5944 "configure"
+#line 5887 "configure"
 #include "confdefs.h"
 $headers
 
@@ -5957,16 +5900,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5963: \$? = $ac_status" >&5
+  echo "$as_me:5906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5969: \$? = $ac_status" >&5
+  echo "$as_me:5912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getuid=yes
 else
@@ -5976,7 +5919,7 @@ ac_cv_have_decl_getuid=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5979: result: $ac_cv_have_decl_getuid" >&5
+echo "$as_me:5922: result: $ac_cv_have_decl_getuid" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getuid" >&6
 if test $ac_cv_have_decl_getuid = yes; then
 
@@ -5990,13 +5933,13 @@ else
 EOF
 
 fi
-echo "$as_me:5993: checking whether getutent is declared" >&5
+echo "$as_me:5936: checking whether getutent is declared" >&5
 echo $ECHO_N "checking whether getutent is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getutent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5999 "configure"
+#line 5942 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6012,16 +5955,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6018: \$? = $ac_status" >&5
+  echo "$as_me:5961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6024: \$? = $ac_status" >&5
+  echo "$as_me:5967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getutent=yes
 else
@@ -6031,7 +5974,7 @@ ac_cv_have_decl_getutent=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6034: result: $ac_cv_have_decl_getutent" >&5
+echo "$as_me:5977: result: $ac_cv_have_decl_getutent" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getutent" >&6
 if test $ac_cv_have_decl_getutent = yes; then
 
@@ -6045,13 +5988,13 @@ else
 EOF
 
 fi
-echo "$as_me:6048: checking whether lseek is declared" >&5
+echo "$as_me:5991: checking whether lseek is declared" >&5
 echo $ECHO_N "checking whether lseek is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_lseek+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6054 "configure"
+#line 5997 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6067,16 +6010,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6073: \$? = $ac_status" >&5
+  echo "$as_me:6016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6079: \$? = $ac_status" >&5
+  echo "$as_me:6022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_lseek=yes
 else
@@ -6086,7 +6029,7 @@ ac_cv_have_decl_lseek=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6089: result: $ac_cv_have_decl_lseek" >&5
+echo "$as_me:6032: result: $ac_cv_have_decl_lseek" >&5
 echo "${ECHO_T}$ac_cv_have_decl_lseek" >&6
 if test $ac_cv_have_decl_lseek = yes; then
 
@@ -6100,13 +6043,13 @@ else
 EOF
 
 fi
-echo "$as_me:6103: checking whether malloc is declared" >&5
+echo "$as_me:6046: checking whether malloc is declared" >&5
 echo $ECHO_N "checking whether malloc is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6109 "configure"
+#line 6052 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6122,16 +6065,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6128: \$? = $ac_status" >&5
+  echo "$as_me:6071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6134: \$? = $ac_status" >&5
+  echo "$as_me:6077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_malloc=yes
 else
@@ -6141,7 +6084,7 @@ ac_cv_have_decl_malloc=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6144: result: $ac_cv_have_decl_malloc" >&5
+echo "$as_me:6087: result: $ac_cv_have_decl_malloc" >&5
 echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6
 if test $ac_cv_have_decl_malloc = yes; then
 
@@ -6155,13 +6098,13 @@ else
 EOF
 
 fi
-echo "$as_me:6158: checking whether memchr is declared" >&5
+echo "$as_me:6101: checking whether memchr is declared" >&5
 echo $ECHO_N "checking whether memchr is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_memchr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6164 "configure"
+#line 6107 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6177,16 +6120,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6183: \$? = $ac_status" >&5
+  echo "$as_me:6126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6189: \$? = $ac_status" >&5
+  echo "$as_me:6132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_memchr=yes
 else
@@ -6196,7 +6139,7 @@ ac_cv_have_decl_memchr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6199: result: $ac_cv_have_decl_memchr" >&5
+echo "$as_me:6142: result: $ac_cv_have_decl_memchr" >&5
 echo "${ECHO_T}$ac_cv_have_decl_memchr" >&6
 if test $ac_cv_have_decl_memchr = yes; then
 
@@ -6210,13 +6153,13 @@ else
 EOF
 
 fi
-echo "$as_me:6213: checking whether memrchr is declared" >&5
+echo "$as_me:6156: checking whether memrchr is declared" >&5
 echo $ECHO_N "checking whether memrchr is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_memrchr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6219 "configure"
+#line 6162 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6232,16 +6175,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6238: \$? = $ac_status" >&5
+  echo "$as_me:6181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6244: \$? = $ac_status" >&5
+  echo "$as_me:6187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_memrchr=yes
 else
@@ -6251,7 +6194,7 @@ ac_cv_have_decl_memrchr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6254: result: $ac_cv_have_decl_memrchr" >&5
+echo "$as_me:6197: result: $ac_cv_have_decl_memrchr" >&5
 echo "${ECHO_T}$ac_cv_have_decl_memrchr" >&6
 if test $ac_cv_have_decl_memrchr = yes; then
 
@@ -6265,13 +6208,13 @@ else
 EOF
 
 fi
-echo "$as_me:6268: checking whether nanosleep is declared" >&5
+echo "$as_me:6211: checking whether nanosleep is declared" >&5
 echo $ECHO_N "checking whether nanosleep is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6274 "configure"
+#line 6217 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6287,16 +6230,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6293: \$? = $ac_status" >&5
+  echo "$as_me:6236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6299: \$? = $ac_status" >&5
+  echo "$as_me:6242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_nanosleep=yes
 else
@@ -6306,7 +6249,7 @@ ac_cv_have_decl_nanosleep=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6309: result: $ac_cv_have_decl_nanosleep" >&5
+echo "$as_me:6252: result: $ac_cv_have_decl_nanosleep" >&5
 echo "${ECHO_T}$ac_cv_have_decl_nanosleep" >&6
 if test $ac_cv_have_decl_nanosleep = yes; then
 
@@ -6320,13 +6263,13 @@ else
 EOF
 
 fi
-echo "$as_me:6323: checking whether realloc is declared" >&5
+echo "$as_me:6266: checking whether realloc is declared" >&5
 echo $ECHO_N "checking whether realloc is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_realloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6329 "configure"
+#line 6272 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6342,16 +6285,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6288: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6348: \$? = $ac_status" >&5
+  echo "$as_me:6291: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6354: \$? = $ac_status" >&5
+  echo "$as_me:6297: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_realloc=yes
 else
@@ -6361,7 +6304,7 @@ ac_cv_have_decl_realloc=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6364: result: $ac_cv_have_decl_realloc" >&5
+echo "$as_me:6307: result: $ac_cv_have_decl_realloc" >&5
 echo "${ECHO_T}$ac_cv_have_decl_realloc" >&6
 if test $ac_cv_have_decl_realloc = yes; then
 
@@ -6375,13 +6318,13 @@ else
 EOF
 
 fi
-echo "$as_me:6378: checking whether stpcpy is declared" >&5
+echo "$as_me:6321: checking whether stpcpy is declared" >&5
 echo $ECHO_N "checking whether stpcpy is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_stpcpy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6384 "configure"
+#line 6327 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6397,16 +6340,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6403: \$? = $ac_status" >&5
+  echo "$as_me:6346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6409: \$? = $ac_status" >&5
+  echo "$as_me:6352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_stpcpy=yes
 else
@@ -6416,7 +6359,7 @@ ac_cv_have_decl_stpcpy=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6419: result: $ac_cv_have_decl_stpcpy" >&5
+echo "$as_me:6362: result: $ac_cv_have_decl_stpcpy" >&5
 echo "${ECHO_T}$ac_cv_have_decl_stpcpy" >&6
 if test $ac_cv_have_decl_stpcpy = yes; then
 
@@ -6430,13 +6373,13 @@ else
 EOF
 
 fi
-echo "$as_me:6433: checking whether strndup is declared" >&5
+echo "$as_me:6376: checking whether strndup is declared" >&5
 echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strndup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6439 "configure"
+#line 6382 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6452,16 +6395,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6458: \$? = $ac_status" >&5
+  echo "$as_me:6401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6464: \$? = $ac_status" >&5
+  echo "$as_me:6407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strndup=yes
 else
@@ -6471,7 +6414,7 @@ ac_cv_have_decl_strndup=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6474: result: $ac_cv_have_decl_strndup" >&5
+echo "$as_me:6417: result: $ac_cv_have_decl_strndup" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6
 if test $ac_cv_have_decl_strndup = yes; then
 
@@ -6485,13 +6428,13 @@ else
 EOF
 
 fi
-echo "$as_me:6488: checking whether strnlen is declared" >&5
+echo "$as_me:6431: checking whether strnlen is declared" >&5
 echo $ECHO_N "checking whether strnlen is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strnlen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6494 "configure"
+#line 6437 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6507,16 +6450,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6513: \$? = $ac_status" >&5
+  echo "$as_me:6456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6519: \$? = $ac_status" >&5
+  echo "$as_me:6462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strnlen=yes
 else
@@ -6526,7 +6469,7 @@ ac_cv_have_decl_strnlen=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6529: result: $ac_cv_have_decl_strnlen" >&5
+echo "$as_me:6472: result: $ac_cv_have_decl_strnlen" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strnlen" >&6
 if test $ac_cv_have_decl_strnlen = yes; then
 
@@ -6540,13 +6483,13 @@ else
 EOF
 
 fi
-echo "$as_me:6543: checking whether strstr is declared" >&5
+echo "$as_me:6486: checking whether strstr is declared" >&5
 echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6549 "configure"
+#line 6492 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6562,16 +6505,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6568: \$? = $ac_status" >&5
+  echo "$as_me:6511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6574: \$? = $ac_status" >&5
+  echo "$as_me:6517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strstr=yes
 else
@@ -6581,7 +6524,7 @@ ac_cv_have_decl_strstr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6584: result: $ac_cv_have_decl_strstr" >&5
+echo "$as_me:6527: result: $ac_cv_have_decl_strstr" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strstr" >&6
 if test $ac_cv_have_decl_strstr = yes; then
 
@@ -6595,13 +6538,13 @@ else
 EOF
 
 fi
-echo "$as_me:6598: checking whether strtoul is declared" >&5
+echo "$as_me:6541: checking whether strtoul is declared" >&5
 echo $ECHO_N "checking whether strtoul is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strtoul+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6604 "configure"
+#line 6547 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6617,16 +6560,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6623: \$? = $ac_status" >&5
+  echo "$as_me:6566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6629: \$? = $ac_status" >&5
+  echo "$as_me:6572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strtoul=yes
 else
@@ -6636,7 +6579,7 @@ ac_cv_have_decl_strtoul=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6639: result: $ac_cv_have_decl_strtoul" >&5
+echo "$as_me:6582: result: $ac_cv_have_decl_strtoul" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strtoul" >&6
 if test $ac_cv_have_decl_strtoul = yes; then
 
@@ -6650,13 +6593,13 @@ else
 EOF
 
 fi
-echo "$as_me:6653: checking whether strtoull is declared" >&5
+echo "$as_me:6596: checking whether strtoull is declared" >&5
 echo $ECHO_N "checking whether strtoull is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strtoull+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6659 "configure"
+#line 6602 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6672,16 +6615,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6678: \$? = $ac_status" >&5
+  echo "$as_me:6621: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6684: \$? = $ac_status" >&5
+  echo "$as_me:6627: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strtoull=yes
 else
@@ -6691,7 +6634,7 @@ ac_cv_have_decl_strtoull=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6694: result: $ac_cv_have_decl_strtoull" >&5
+echo "$as_me:6637: result: $ac_cv_have_decl_strtoull" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strtoull" >&6
 if test $ac_cv_have_decl_strtoull = yes; then
 
@@ -6705,13 +6648,13 @@ else
 EOF
 
 fi
-echo "$as_me:6708: checking whether ttyname is declared" >&5
+echo "$as_me:6651: checking whether ttyname is declared" >&5
 echo $ECHO_N "checking whether ttyname is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_ttyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6714 "configure"
+#line 6657 "configure"
 #include "confdefs.h"
 $headers
 
@@ -6727,16 +6670,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6733: \$? = $ac_status" >&5
+  echo "$as_me:6676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6739: \$? = $ac_status" >&5
+  echo "$as_me:6682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_ttyname=yes
 else
@@ -6746,7 +6689,7 @@ ac_cv_have_decl_ttyname=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6749: result: $ac_cv_have_decl_ttyname" >&5
+echo "$as_me:6692: result: $ac_cv_have_decl_ttyname" >&5
 echo "${ECHO_T}$ac_cv_have_decl_ttyname" >&6
 if test $ac_cv_have_decl_ttyname = yes; then
 
@@ -6761,7 +6704,7 @@ EOF
 
 fi
 
-    echo "$as_me:6764: checking for long file names" >&5
+    echo "$as_me:6707: checking for long file names" >&5
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6800,7 +6743,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo 
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:6803: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:6746: result: $ac_cv_sys_long_file_names" >&5
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 
@@ -6813,13 +6756,13 @@ fi
 for ac_func in pathconf
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6816: checking for $ac_func" >&5
+echo "$as_me:6759: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6822 "configure"
+#line 6765 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6850,16 +6793,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6856: \$? = $ac_status" >&5
+  echo "$as_me:6799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6862: \$? = $ac_status" >&5
+  echo "$as_me:6805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -6869,7 +6812,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6872: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:6815: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6882,23 +6825,23 @@ done
 for ac_header in limits.h string.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:6885: checking for $ac_header" >&5
+echo "$as_me:6828: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6891 "configure"
+#line 6834 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6895: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6838: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6901: \$? = $ac_status" >&5
+  echo "$as_me:6844: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6917,7 +6860,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6920: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:6863: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6927,7 +6870,7 @@ EOF
 fi
 done
 
-  echo "$as_me:6930: checking for library containing gethostbyname" >&5
+  echo "$as_me:6873: checking for library containing gethostbyname" >&5
 echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_search_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6936,7 +6879,7 @@ else
     ac_func_search_save_LIBS=$LIBS
     ac_cv_search_gethostbyname=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 6939 "configure"
+#line 6882 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6955,16 +6898,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6961: \$? = $ac_status" >&5
+  echo "$as_me:6904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6967: \$? = $ac_status" >&5
+  echo "$as_me:6910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_gethostbyname='none required'
 else
@@ -6976,7 +6919,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       for ac_lib in inet nsl; do
 	LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 6979 "configure"
+#line 6922 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6995,16 +6938,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7001: \$? = $ac_status" >&5
+  echo "$as_me:6944: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7007: \$? = $ac_status" >&5
+  echo "$as_me:6950: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_gethostbyname="-l$ac_lib"; break
 else
@@ -7017,7 +6960,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     LIBS=$ac_func_search_save_LIBS
 
 fi
-echo "$as_me:7020: result: $ac_cv_search_gethostbyname" >&5
+echo "$as_me:6963: result: $ac_cv_search_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
 
   if test "$ac_cv_search_gethostbyname" = no; then :
@@ -7034,13 +6977,13 @@ echo "${ECHO_T}$ac_cv_search_gethostbyna
 for ac_func in gethostbyname gethostbyaddr inet_ntoa
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7037: checking for $ac_func" >&5
+echo "$as_me:6980: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7043 "configure"
+#line 6986 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7071,16 +7014,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7077: \$? = $ac_status" >&5
+  echo "$as_me:7020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7083: \$? = $ac_status" >&5
+  echo "$as_me:7026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -7090,7 +7033,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7093: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:7036: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7103,13 +7046,13 @@ done
 for ac_func in gethostbyname gethostbyaddr inet_ntoa
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7106: checking for $ac_func" >&5
+echo "$as_me:7049: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7112 "configure"
+#line 7055 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7140,16 +7083,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7146: \$? = $ac_status" >&5
+  echo "$as_me:7089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7152: \$? = $ac_status" >&5
+  echo "$as_me:7095: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -7159,7 +7102,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7162: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:7105: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7173,23 +7116,23 @@ for ac_header in unistd.h string.h netdb
                    netinet/in.h arpa/inet.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:7176: checking for $ac_header" >&5
+echo "$as_me:7119: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7182 "configure"
+#line 7125 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7186: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7129: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7192: \$? = $ac_status" >&5
+  echo "$as_me:7135: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7208,7 +7151,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7211: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:7154: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7218,13 +7161,13 @@ EOF
 fi
 done
 
-  echo "$as_me:7221: checking for ANSI C header files" >&5
+  echo "$as_me:7164: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7227 "configure"
+#line 7170 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7232,13 +7175,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7235: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7178: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7241: \$? = $ac_status" >&5
+  echo "$as_me:7184: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7260,7 +7203,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7263 "configure"
+#line 7206 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -7278,7 +7221,7 @@ fi
 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 <<_ACEOF
-#line 7281 "configure"
+#line 7224 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -7299,7 +7242,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7302 "configure"
+#line 7245 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7325,15 +7268,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7331: \$? = $ac_status" >&5
+  echo "$as_me:7274: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7336: \$? = $ac_status" >&5
+  echo "$as_me:7279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7342,11 +7285,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:7349: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7292: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -7359,23 +7302,23 @@ fi
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:7362: checking for $ac_header" >&5
+echo "$as_me:7305: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7368 "configure"
+#line 7311 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7372: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7315: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7378: \$? = $ac_status" >&5
+  echo "$as_me:7321: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7394,7 +7337,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7397: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:7340: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7407,13 +7350,13 @@ done
 for ac_func in strerror strerror_r vprintf doprnt
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7410: checking for $ac_func" >&5
+echo "$as_me:7353: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7416 "configure"
+#line 7359 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7444,16 +7387,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7450: \$? = $ac_status" >&5
+  echo "$as_me:7393: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7456: \$? = $ac_status" >&5
+  echo "$as_me:7399: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -7463,7 +7406,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7466: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:7409: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7473,13 +7416,13 @@ EOF
 fi
 done
 
-  echo "$as_me:7476: checking whether strerror_r is declared" >&5
+  echo "$as_me:7419: checking whether strerror_r is declared" >&5
 echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strerror_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7482 "configure"
+#line 7425 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7494,16 +7437,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7500: \$? = $ac_status" >&5
+  echo "$as_me:7443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7506: \$? = $ac_status" >&5
+  echo "$as_me:7449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strerror_r=yes
 else
@@ -7513,7 +7456,7 @@ ac_cv_have_decl_strerror_r=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7516: result: $ac_cv_have_decl_strerror_r" >&5
+echo "$as_me:7459: result: $ac_cv_have_decl_strerror_r" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6
 if test $ac_cv_have_decl_strerror_r = yes; then
 
@@ -7531,13 +7474,13 @@ fi
 for ac_func in strerror_r
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7534: checking for $ac_func" >&5
+echo "$as_me:7477: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7540 "configure"
+#line 7483 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7568,16 +7511,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7574: \$? = $ac_status" >&5
+  echo "$as_me:7517: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7580: \$? = $ac_status" >&5
+  echo "$as_me:7523: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -7587,7 +7530,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7590: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:7533: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7602,23 +7545,23 @@ if test $ac_cv_func_strerror_r = yes; th
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:7605: checking for $ac_header" >&5
+echo "$as_me:7548: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7611 "configure"
+#line 7554 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7615: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7558: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7621: \$? = $ac_status" >&5
+  echo "$as_me:7564: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7637,7 +7580,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7640: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:7583: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7647,14 +7590,14 @@ EOF
 fi
 done
 
-  echo "$as_me:7650: checking for working strerror_r" >&5
+  echo "$as_me:7593: checking for working strerror_r" >&5
 echo $ECHO_N "checking for working strerror_r... $ECHO_C" >&6
 if test "${ac_cv_func_strerror_r_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 7657 "configure"
+#line 7600 "configure"
 #include "confdefs.h"
 
 #       include <stdio.h>
@@ -7674,16 +7617,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7680: \$? = $ac_status" >&5
+  echo "$as_me:7623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7686: \$? = $ac_status" >&5
+  echo "$as_me:7629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_strerror_r_works=yes
 else
@@ -7704,7 +7647,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
   ac_cv_func_strerror_r_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7707 "configure"
+#line 7650 "configure"
 #include "confdefs.h"
 
 #       include <stdio.h>
@@ -7723,15 +7666,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7729: \$? = $ac_status" >&5
+  echo "$as_me:7672: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7734: \$? = $ac_status" >&5
+  echo "$as_me:7677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_strerror_r_works=yes
 else
@@ -7740,12 +7683,12 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_strerror_r_works=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
     fi
 
 fi
-echo "$as_me:7748: result: $ac_cv_func_strerror_r_works" >&5
+echo "$as_me:7691: result: $ac_cv_func_strerror_r_works" >&5
 echo "${ECHO_T}$ac_cv_func_strerror_r_works" >&6
   if test $ac_cv_func_strerror_r_works = yes; then
 
@@ -7756,13 +7699,13 @@ EOF
   fi
 fi
 
-  echo "$as_me:7759: checking for ANSI C header files" >&5
+  echo "$as_me:7702: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7765 "configure"
+#line 7708 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7770,13 +7713,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7773: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7716: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7779: \$? = $ac_status" >&5
+  echo "$as_me:7722: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7798,7 +7741,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7801 "configure"
+#line 7744 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -7816,7 +7759,7 @@ fi
 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 <<_ACEOF
-#line 7819 "configure"
+#line 7762 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -7837,7 +7780,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7840 "configure"
+#line 7783 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7863,15 +7806,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7869: \$? = $ac_status" >&5
+  echo "$as_me:7812: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7874: \$? = $ac_status" >&5
+  echo "$as_me:7817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7880,11 +7823,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:7887: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7830: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -7897,13 +7840,13 @@ fi
 for ac_func in getpagesize
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7900: checking for $ac_func" >&5
+echo "$as_me:7843: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7906 "configure"
+#line 7849 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7934,16 +7877,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7940: \$? = $ac_status" >&5
+  echo "$as_me:7883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7946: \$? = $ac_status" >&5
+  echo "$as_me:7889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -7953,7 +7896,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7956: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:7899: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7966,23 +7909,23 @@ done
 for ac_header in OS.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:7969: checking for $ac_header" >&5
+echo "$as_me:7912: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7975 "configure"
+#line 7918 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7979: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7922: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7985: \$? = $ac_status" >&5
+  echo "$as_me:7928: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8001,7 +7944,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8004: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:7947: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8014,23 +7957,23 @@ done
 for ac_header in stdlib.h stdbool.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8017: checking for $ac_header" >&5
+echo "$as_me:7960: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8023 "configure"
+#line 7966 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8027: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7970: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8033: \$? = $ac_status" >&5
+  echo "$as_me:7976: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8049,7 +7992,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8052: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:7995: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8062,23 +8005,23 @@ done
 for ac_header in limits.h stdlib.h string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8065: checking for $ac_header" >&5
+echo "$as_me:8008: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8071 "configure"
+#line 8014 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8075: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8018: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8081: \$? = $ac_status" >&5
+  echo "$as_me:8024: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8097,7 +8040,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8100: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:8043: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8107,13 +8050,13 @@ EOF
 fi
 done
 
-  echo "$as_me:8110: checking whether getenv is declared" >&5
+  echo "$as_me:8053: checking whether getenv is declared" >&5
 echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8116 "configure"
+#line 8059 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8128,16 +8071,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8134: \$? = $ac_status" >&5
+  echo "$as_me:8077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8140: \$? = $ac_status" >&5
+  echo "$as_me:8083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getenv=yes
 else
@@ -8147,7 +8090,7 @@ ac_cv_have_decl_getenv=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8150: result: $ac_cv_have_decl_getenv" >&5
+echo "$as_me:8093: result: $ac_cv_have_decl_getenv" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6
 if test $ac_cv_have_decl_getenv = yes; then
 
@@ -8165,23 +8108,23 @@ fi
 for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8168: checking for $ac_header" >&5
+echo "$as_me:8111: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8174 "configure"
+#line 8117 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8178: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8121: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8184: \$? = $ac_status" >&5
+  echo "$as_me:8127: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8200,7 +8143,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8203: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:8146: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8213,13 +8156,13 @@ done
 for ac_func in isascii iswprint wcwidth
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8216: checking for $ac_func" >&5
+echo "$as_me:8159: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8222 "configure"
+#line 8165 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8250,16 +8193,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8256: \$? = $ac_status" >&5
+  echo "$as_me:8199: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8262: \$? = $ac_status" >&5
+  echo "$as_me:8205: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -8269,7 +8212,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8272: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:8215: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8279,13 +8222,13 @@ EOF
 fi
 done
 
-  echo "$as_me:8282: checking whether mbrtowc and mbstate_t are properly declared" >&5
+  echo "$as_me:8225: checking whether mbrtowc and mbstate_t are properly declared" >&5
 echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
 if test "${jm_cv_func_mbrtowc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8288 "configure"
+#line 8231 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int
@@ -8297,16 +8240,16 @@ mbstate_t state; return ! (sizeof state 
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8303: \$? = $ac_status" >&5
+  echo "$as_me:8246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8309: \$? = $ac_status" >&5
+  echo "$as_me:8252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_mbrtowc=yes
 else
@@ -8316,7 +8259,7 @@ jm_cv_func_mbrtowc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8319: result: $jm_cv_func_mbrtowc" >&5
+echo "$as_me:8262: result: $jm_cv_func_mbrtowc" >&5
 echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6
   if test $jm_cv_func_mbrtowc = yes; then
 
@@ -8331,13 +8274,13 @@ EOF
 #      include <wchar.h>
 #     endif
 '
-  echo "$as_me:8334: checking whether wcwidth is declared" >&5
+  echo "$as_me:8277: checking whether wcwidth is declared" >&5
 echo $ECHO_N "checking whether wcwidth is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_wcwidth+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8340 "configure"
+#line 8283 "configure"
 #include "confdefs.h"
 $headers
 
@@ -8353,16 +8296,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8299: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8359: \$? = $ac_status" >&5
+  echo "$as_me:8302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8365: \$? = $ac_status" >&5
+  echo "$as_me:8308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_wcwidth=yes
 else
@@ -8372,7 +8315,7 @@ ac_cv_have_decl_wcwidth=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8375: result: $ac_cv_have_decl_wcwidth" >&5
+echo "$as_me:8318: result: $ac_cv_have_decl_wcwidth" >&5
 echo "${ECHO_T}$ac_cv_have_decl_wcwidth" >&6
 if test $ac_cv_have_decl_wcwidth = yes; then
 
@@ -8390,23 +8333,23 @@ fi
 for ac_header in stdlib.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8393: checking for $ac_header" >&5
+echo "$as_me:8336: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8399 "configure"
+#line 8342 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8403: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8346: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8409: \$? = $ac_status" >&5
+  echo "$as_me:8352: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8425,7 +8368,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8428: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:8371: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8435,13 +8378,13 @@ EOF
 fi
 done
 
-   echo "$as_me:8438: checking for mbstate_t" >&5
+   echo "$as_me:8381: checking for mbstate_t" >&5
 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8444 "configure"
+#line 8387 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -8457,16 +8400,16 @@ mbstate_t x; return sizeof x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8463: \$? = $ac_status" >&5
+  echo "$as_me:8406: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8469: \$? = $ac_status" >&5
+  echo "$as_me:8412: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mbstate_t=yes
 else
@@ -8476,7 +8419,7 @@ ac_cv_type_mbstate_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8479: result: $ac_cv_type_mbstate_t" >&5
+echo "$as_me:8422: result: $ac_cv_type_mbstate_t" >&5
 echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
    if test $ac_cv_type_mbstate_t = no; then
 
@@ -8489,23 +8432,23 @@ EOF
 for ac_header in limits.h stdlib.h bp-sym.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8492: checking for $ac_header" >&5
+echo "$as_me:8435: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8498 "configure"
+#line 8441 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8502: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8445: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8508: \$? = $ac_status" >&5
+  echo "$as_me:8451: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8524,7 +8467,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8527: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:8470: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8537,13 +8480,13 @@ done
 for ac_func in isascii iswprint
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8540: checking for $ac_func" >&5
+echo "$as_me:8483: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8546 "configure"
+#line 8489 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8574,16 +8517,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8580: \$? = $ac_status" >&5
+  echo "$as_me:8523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8586: \$? = $ac_status" >&5
+  echo "$as_me:8529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -8593,7 +8536,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8596: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:8539: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8603,13 +8546,13 @@ EOF
 fi
 done
 
-  echo "$as_me:8606: checking whether mbrtowc and mbstate_t are properly declared" >&5
+  echo "$as_me:8549: checking whether mbrtowc and mbstate_t are properly declared" >&5
 echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
 if test "${jm_cv_func_mbrtowc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8612 "configure"
+#line 8555 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int
@@ -8621,16 +8564,16 @@ mbstate_t state; return ! (sizeof state 
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8627: \$? = $ac_status" >&5
+  echo "$as_me:8570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8633: \$? = $ac_status" >&5
+  echo "$as_me:8576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_mbrtowc=yes
 else
@@ -8640,7 +8583,7 @@ jm_cv_func_mbrtowc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8643: result: $jm_cv_func_mbrtowc" >&5
+echo "$as_me:8586: result: $jm_cv_func_mbrtowc" >&5
 echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6
   if test $jm_cv_func_mbrtowc = yes; then
 
@@ -8653,23 +8596,23 @@ EOF
 for ac_header in limits.h stddef.h stdlib.h string.h wchar.h wctype.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8656: checking for $ac_header" >&5
+echo "$as_me:8599: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8662 "configure"
+#line 8605 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8666: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8609: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8672: \$? = $ac_status" >&5
+  echo "$as_me:8615: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8688,7 +8631,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8691: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:8634: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8698,13 +8641,13 @@ EOF
 fi
 done
 
-  echo "$as_me:8701: checking for ANSI C header files" >&5
+  echo "$as_me:8644: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8707 "configure"
+#line 8650 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8712,13 +8655,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:8715: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8658: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8721: \$? = $ac_status" >&5
+  echo "$as_me:8664: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8740,7 +8683,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 8743 "configure"
+#line 8686 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -8758,7 +8701,7 @@ fi
 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 <<_ACEOF
-#line 8761 "configure"
+#line 8704 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -8779,7 +8722,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8782 "configure"
+#line 8725 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -8805,15 +8748,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8811: \$? = $ac_status" >&5
+  echo "$as_me:8754: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8816: \$? = $ac_status" >&5
+  echo "$as_me:8759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8822,11 +8765,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:8829: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8772: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -8836,13 +8779,13 @@ EOF
 
 fi
 
-  echo "$as_me:8839: checking whether backslash-a works in strings" >&5
+  echo "$as_me:8782: checking whether backslash-a works in strings" >&5
 echo $ECHO_N "checking whether backslash-a works in strings... $ECHO_C" >&6
 if test "${ac_cv_c_backslash_a+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8845 "configure"
+#line 8788 "configure"
 #include "confdefs.h"
 
 int
@@ -8861,16 +8804,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8867: \$? = $ac_status" >&5
+  echo "$as_me:8810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8873: \$? = $ac_status" >&5
+  echo "$as_me:8816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_backslash_a=yes
 else
@@ -8880,7 +8823,7 @@ ac_cv_c_backslash_a=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8883: result: $ac_cv_c_backslash_a" >&5
+echo "$as_me:8826: result: $ac_cv_c_backslash_a" >&5
 echo "${ECHO_T}$ac_cv_c_backslash_a" >&6
   if test $ac_cv_c_backslash_a = yes; then
 
@@ -8893,23 +8836,23 @@ EOF
 for ac_header in stdlib.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:8896: checking for $ac_header" >&5
+echo "$as_me:8839: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8902 "configure"
+#line 8845 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8906: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8849: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8912: \$? = $ac_status" >&5
+  echo "$as_me:8855: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8928,7 +8871,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8931: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:8874: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8938,13 +8881,13 @@ EOF
 fi
 done
 
-   echo "$as_me:8941: checking for mbstate_t" >&5
+   echo "$as_me:8884: checking for mbstate_t" >&5
 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8947 "configure"
+#line 8890 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDLIB_H
@@ -8960,16 +8903,16 @@ mbstate_t x; return sizeof x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8966: \$? = $ac_status" >&5
+  echo "$as_me:8909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8972: \$? = $ac_status" >&5
+  echo "$as_me:8915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mbstate_t=yes
 else
@@ -8979,7 +8922,7 @@ ac_cv_type_mbstate_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8982: result: $ac_cv_type_mbstate_t" >&5
+echo "$as_me:8925: result: $ac_cv_type_mbstate_t" >&5
 echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
    if test $ac_cv_type_mbstate_t = no; then
 
@@ -8989,10 +8932,10 @@ EOF
 
    fi
 
-echo "$as_me:8992: checking for function prototypes" >&5
+echo "$as_me:8935: checking for function prototypes" >&5
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
-  echo "$as_me:8995: result: yes" >&5
+  echo "$as_me:8938: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -9001,18 +8944,18 @@ EOF
 
   U= ANSI2KNR=
 else
-  echo "$as_me:9004: result: no" >&5
+  echo "$as_me:8947: result: no" >&5
 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
 fi
 # Ensure some checks needed by ansi2knr itself.
-echo "$as_me:9009: checking for ANSI C header files" >&5
+echo "$as_me:8952: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9015 "configure"
+#line 8958 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9020,13 +8963,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:9023: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8966: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9029: \$? = $ac_status" >&5
+  echo "$as_me:8972: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9048,7 +8991,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 9051 "configure"
+#line 8994 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -9066,7 +9009,7 @@ fi
 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 <<_ACEOF
-#line 9069 "configure"
+#line 9012 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -9087,7 +9030,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9090 "configure"
+#line 9033 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -9113,15 +9056,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9119: \$? = $ac_status" >&5
+  echo "$as_me:9062: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9124: \$? = $ac_status" >&5
+  echo "$as_me:9067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9130,11 +9073,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:9137: result: $ac_cv_header_stdc" >&5
+echo "$as_me:9080: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -9147,23 +9090,23 @@ fi
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:9150: checking for $ac_header" >&5
+echo "$as_me:9093: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9156 "configure"
+#line 9099 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9160: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9103: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9166: \$? = $ac_status" >&5
+  echo "$as_me:9109: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9182,7 +9125,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9185: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:9128: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9192,13 +9135,13 @@ EOF
 fi
 done
 
-  echo "$as_me:9195: checking for ANSI C header files" >&5
+  echo "$as_me:9138: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9201 "configure"
+#line 9144 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9206,13 +9149,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:9209: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9152: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9215: \$? = $ac_status" >&5
+  echo "$as_me:9158: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9234,7 +9177,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 9237 "configure"
+#line 9180 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -9252,7 +9195,7 @@ fi
 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 <<_ACEOF
-#line 9255 "configure"
+#line 9198 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -9273,7 +9216,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9276 "configure"
+#line 9219 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -9299,15 +9242,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9305: \$? = $ac_status" >&5
+  echo "$as_me:9248: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9310: \$? = $ac_status" >&5
+  echo "$as_me:9253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9316,11 +9259,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:9323: result: $ac_cv_header_stdc" >&5
+echo "$as_me:9266: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -9333,23 +9276,23 @@ fi
 for ac_header in string.h utmp.h utmpx.h sys/param.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:9336: checking for $ac_header" >&5
+echo "$as_me:9279: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9342 "configure"
+#line 9285 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9346: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9289: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9352: \$? = $ac_status" >&5
+  echo "$as_me:9295: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9368,7 +9311,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9371: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:9314: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9381,13 +9324,13 @@ done
 for ac_func in utmpname
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:9384: checking for $ac_func" >&5
+echo "$as_me:9327: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9390 "configure"
+#line 9333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9418,16 +9361,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9424: \$? = $ac_status" >&5
+  echo "$as_me:9367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9430: \$? = $ac_status" >&5
+  echo "$as_me:9373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -9437,7 +9380,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9440: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:9383: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9450,13 +9393,13 @@ done
 for ac_func in utmpxname
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:9453: checking for $ac_func" >&5
+echo "$as_me:9396: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9459 "configure"
+#line 9402 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9487,16 +9430,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9493: \$? = $ac_status" >&5
+  echo "$as_me:9436: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9499: \$? = $ac_status" >&5
+  echo "$as_me:9442: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -9506,7 +9449,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9509: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:9452: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9516,10 +9459,10 @@ EOF
 fi
 done
 
-echo "$as_me:9519: checking for function prototypes" >&5
+echo "$as_me:9462: checking for function prototypes" >&5
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
-  echo "$as_me:9522: result: yes" >&5
+  echo "$as_me:9465: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -9528,18 +9471,18 @@ EOF
 
   U= ANSI2KNR=
 else
-  echo "$as_me:9531: result: no" >&5
+  echo "$as_me:9474: result: no" >&5
 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
 fi
 # Ensure some checks needed by ansi2knr itself.
-echo "$as_me:9536: checking for ANSI C header files" >&5
+echo "$as_me:9479: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9542 "configure"
+#line 9485 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9547,13 +9490,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:9550: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9493: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9556: \$? = $ac_status" >&5
+  echo "$as_me:9499: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9575,7 +9518,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 9578 "configure"
+#line 9521 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -9593,7 +9536,7 @@ fi
 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 <<_ACEOF
-#line 9596 "configure"
+#line 9539 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -9614,7 +9557,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9617 "configure"
+#line 9560 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -9640,15 +9583,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9646: \$? = $ac_status" >&5
+  echo "$as_me:9589: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9651: \$? = $ac_status" >&5
+  echo "$as_me:9594: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9657,11 +9600,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:9664: result: $ac_cv_header_stdc" >&5
+echo "$as_me:9607: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -9674,23 +9617,23 @@ fi
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:9677: checking for $ac_header" >&5
+echo "$as_me:9620: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9683 "configure"
+#line 9626 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9687: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9630: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9693: \$? = $ac_status" >&5
+  echo "$as_me:9636: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9709,7 +9652,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9712: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:9655: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9729,13 +9672,13 @@ $ac_includes_default
 # include <utmp.h>
 #endif
 "
-    echo "$as_me:9732: checking for struct utmpx.ut_user" >&5
+    echo "$as_me:9675: checking for struct utmpx.ut_user" >&5
 echo $ECHO_N "checking for struct utmpx.ut_user... $ECHO_C" >&6
 if test "${ac_cv_member_struct_utmpx_ut_user+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9738 "configure"
+#line 9681 "configure"
 #include "confdefs.h"
 $utmp_includes
 
@@ -9749,16 +9692,16 @@ foo.ut_user;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9755: \$? = $ac_status" >&5
+  echo "$as_me:9698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9761: \$? = $ac_status" >&5
+  echo "$as_me:9704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_utmpx_ut_user=yes
 else
@@ -9768,7 +9711,7 @@ ac_cv_member_struct_utmpx_ut_user=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9771: result: $ac_cv_member_struct_utmpx_ut_user" >&5
+echo "$as_me:9714: result: $ac_cv_member_struct_utmpx_ut_user" >&5
 echo "${ECHO_T}$ac_cv_member_struct_utmpx_ut_user" >&6
 if test $ac_cv_member_struct_utmpx_ut_user = yes; then
 
@@ -9778,13 +9721,13 @@ EOF
 
 fi
 
-    echo "$as_me:9781: checking for struct utmp.ut_user" >&5
+    echo "$as_me:9724: checking for struct utmp.ut_user" >&5
 echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6
 if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9787 "configure"
+#line 9730 "configure"
 #include "confdefs.h"
 $utmp_includes
 
@@ -9798,16 +9741,16 @@ foo.ut_user;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9804: \$? = $ac_status" >&5
+  echo "$as_me:9747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9810: \$? = $ac_status" >&5
+  echo "$as_me:9753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_utmp_ut_user=yes
 else
@@ -9817,7 +9760,7 @@ ac_cv_member_struct_utmp_ut_user=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9820: result: $ac_cv_member_struct_utmp_ut_user" >&5
+echo "$as_me:9763: result: $ac_cv_member_struct_utmp_ut_user" >&5
 echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6
 if test $ac_cv_member_struct_utmp_ut_user = yes; then
 
@@ -9827,13 +9770,13 @@ EOF
 
 fi
 
-    echo "$as_me:9830: checking for struct utmpx.ut_name" >&5
+    echo "$as_me:9773: checking for struct utmpx.ut_name" >&5
 echo $ECHO_N "checking for struct utmpx.ut_name... $ECHO_C" >&6
 if test "${ac_cv_member_struct_utmpx_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9836 "configure"
+#line 9779 "configure"
 #include "confdefs.h"
 $utmp_includes
 
@@ -9847,16 +9790,16 @@ foo.ut_name;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9853: \$? = $ac_status" >&5
+  echo "$as_me:9796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9859: \$? = $ac_status" >&5
+  echo "$as_me:9802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_utmpx_ut_name=yes
 else
@@ -9866,7 +9809,7 @@ ac_cv_member_struct_utmpx_ut_name=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9869: result: $ac_cv_member_struct_utmpx_ut_name" >&5
+echo "$as_me:9812: result: $ac_cv_member_struct_utmpx_ut_name" >&5
 echo "${ECHO_T}$ac_cv_member_struct_utmpx_ut_name" >&6
 if test $ac_cv_member_struct_utmpx_ut_name = yes; then
 
@@ -9876,13 +9819,13 @@ EOF
 
 fi
 
-    echo "$as_me:9879: checking for struct utmp.ut_name" >&5
+    echo "$as_me:9822: checking for struct utmp.ut_name" >&5
 echo $ECHO_N "checking for struct utmp.ut_name... $ECHO_C" >&6
 if test "${ac_cv_member_struct_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9885 "configure"
+#line 9828 "configure"
 #include "confdefs.h"
 $utmp_includes
 
@@ -9896,16 +9839,16 @@ foo.ut_name;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9902: \$? = $ac_status" >&5
+  echo "$as_me:9845: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9908: \$? = $ac_status" >&5
+  echo "$as_me:9851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_utmp_ut_name=yes
 else
@@ -9915,7 +9858,7 @@ ac_cv_member_struct_utmp_ut_name=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9918: result: $ac_cv_member_struct_utmp_ut_name" >&5
+echo "$as_me:9861: result: $ac_cv_member_struct_utmp_ut_name" >&5
 echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_name" >&6
 if test $ac_cv_member_struct_utmp_ut_name = yes; then
 
@@ -9931,13 +9874,13 @@ fi
 for ac_func in bzero bcopy isascii btowc
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:9934: checking for $ac_func" >&5
+echo "$as_me:9877: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9940 "configure"
+#line 9883 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9968,16 +9911,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9974: \$? = $ac_status" >&5
+  echo "$as_me:9917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9980: \$? = $ac_status" >&5
+  echo "$as_me:9923: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -9987,7 +9930,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9990: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:9933: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10000,23 +9943,23 @@ done
 for ac_header in alloca.h libintl.h wctype.h wchar.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:10003: checking for $ac_header" >&5
+echo "$as_me:9946: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10009 "configure"
+#line 9952 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10013: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9956: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10019: \$? = $ac_status" >&5
+  echo "$as_me:9962: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10035,7 +9978,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10038: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:9981: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10045,13 +9988,13 @@ EOF
 fi
 done
 
-  echo "$as_me:10048: checking for ANSI C header files" >&5
+  echo "$as_me:9991: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10054 "configure"
+#line 9997 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -10059,13 +10002,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:10062: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10005: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10068: \$? = $ac_status" >&5
+  echo "$as_me:10011: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10087,7 +10030,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 10090 "configure"
+#line 10033 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -10105,7 +10048,7 @@ fi
 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 <<_ACEOF
-#line 10108 "configure"
+#line 10051 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -10126,7 +10069,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10129 "configure"
+#line 10072 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -10152,15 +10095,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10155: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10158: \$? = $ac_status" >&5
+  echo "$as_me:10101: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10163: \$? = $ac_status" >&5
+  echo "$as_me:10106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10169,11 +10112,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:10176: result: $ac_cv_header_stdc" >&5
+echo "$as_me:10119: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -10185,13 +10128,13 @@ fi
 
   # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:10188: checking for working alloca.h" >&5
+echo "$as_me:10131: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10194 "configure"
+#line 10137 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -10203,16 +10146,16 @@ char *p = (char *) alloca (2 * sizeof (i
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10209: \$? = $ac_status" >&5
+  echo "$as_me:10152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10215: \$? = $ac_status" >&5
+  echo "$as_me:10158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -10222,7 +10165,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10225: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:10168: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -10232,13 +10175,13 @@ EOF
 
 fi
 
-echo "$as_me:10235: checking for alloca" >&5
+echo "$as_me:10178: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10241 "configure"
+#line 10184 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -10270,16 +10213,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10276: \$? = $ac_status" >&5
+  echo "$as_me:10219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10282: \$? = $ac_status" >&5
+  echo "$as_me:10225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -10289,7 +10232,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10292: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:10235: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -10310,13 +10253,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:10313: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:10256: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10319 "configure"
+#line 10262 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -10334,18 +10277,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:10337: result: $ac_cv_os_cray" >&5
+echo "$as_me:10280: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:10342: checking for $ac_func" >&5
+echo "$as_me:10285: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10348 "configure"
+#line 10291 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10376,16 +10319,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10382: \$? = $ac_status" >&5
+  echo "$as_me:10325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10388: \$? = $ac_status" >&5
+  echo "$as_me:10331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -10395,7 +10338,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10398: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:10341: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
 
@@ -10409,7 +10352,7 @@ fi
   done
 fi
 
-echo "$as_me:10412: checking stack direction for C alloca" >&5
+echo "$as_me:10355: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10418,7 +10361,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10421 "configure"
+#line 10364 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -10441,15 +10384,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10447: \$? = $ac_status" >&5
+  echo "$as_me:10390: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10452: \$? = $ac_status" >&5
+  echo "$as_me:10395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -10458,10 +10401,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_c_stack_direction=-1
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10464: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:10407: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -10470,13 +10413,13 @@ EOF
 
 fi
 
-  echo "$as_me:10473: checking for ANSI C header files" >&5
+  echo "$as_me:10416: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10479 "configure"
+#line 10422 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -10484,13 +10427,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:10487: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10430: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10493: \$? = $ac_status" >&5
+  echo "$as_me:10436: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10512,7 +10455,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 10515 "configure"
+#line 10458 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -10530,7 +10473,7 @@ fi
 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 <<_ACEOF
-#line 10533 "configure"
+#line 10476 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -10551,7 +10494,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10554 "configure"
+#line 10497 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -10577,15 +10520,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10583: \$? = $ac_status" >&5
+  echo "$as_me:10526: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10588: \$? = $ac_status" >&5
+  echo "$as_me:10531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10594,11 +10537,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:10601: result: $ac_cv_header_stdc" >&5
+echo "$as_me:10544: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -10608,13 +10551,13 @@ EOF
 
 fi
 
-  echo "$as_me:10611: checking whether stat file-mode macros are broken" >&5
+  echo "$as_me:10554: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10617 "configure"
+#line 10560 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10653,7 +10596,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:10656: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:10599: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -10666,23 +10609,23 @@ fi
 for ac_header in fcntl.h sys/time.h stdint.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:10669: checking for $ac_header" >&5
+echo "$as_me:10612: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10675 "configure"
+#line 10618 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10679: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10622: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10685: \$? = $ac_status" >&5
+  echo "$as_me:10628: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10701,7 +10644,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10704: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:10647: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10714,13 +10657,13 @@ done
 for ac_func in __secure_getenv gettimeofday
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:10717: checking for $ac_func" >&5
+echo "$as_me:10660: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10723 "configure"
+#line 10666 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10751,16 +10694,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10757: \$? = $ac_status" >&5
+  echo "$as_me:10700: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10763: \$? = $ac_status" >&5
+  echo "$as_me:10706: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -10770,7 +10713,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10773: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:10716: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10785,13 +10728,13 @@ done
 for ac_func in lchown
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:10788: checking for $ac_func" >&5
+echo "$as_me:10731: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10794 "configure"
+#line 10737 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10822,16 +10765,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10828: \$? = $ac_status" >&5
+  echo "$as_me:10771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10834: \$? = $ac_status" >&5
+  echo "$as_me:10777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -10841,7 +10784,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10844: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:10787: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10853,7 +10796,7 @@ else
 fi
 done
 
-  echo "$as_me:10856: checking for rmdir-not-empty errno value" >&5
+  echo "$as_me:10799: checking for rmdir-not-empty errno value" >&5
 echo $ECHO_N "checking for rmdir-not-empty errno value... $ECHO_C" >&6
 if test "${fetish_cv_func_rmdir_errno_not_empty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10867,7 +10810,7 @@ else
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10870 "configure"
+#line 10813 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10888,15 +10831,15 @@ extern int errno;
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10894: \$? = $ac_status" >&5
+  echo "$as_me:10837: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10899: \$? = $ac_status" >&5
+  echo "$as_me:10842: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`
 else
@@ -10905,11 +10848,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fetish_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4'
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:10912: result: $fetish_cv_func_rmdir_errno_not_empty" >&5
+echo "$as_me:10855: result: $fetish_cv_func_rmdir_errno_not_empty" >&5
 echo "${ECHO_T}$fetish_cv_func_rmdir_errno_not_empty" >&6
 
 cat >>confdefs.h <<EOF
@@ -10921,23 +10864,23 @@ EOF
 for ac_header in unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:10924: checking for $ac_header" >&5
+echo "$as_me:10867: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10930 "configure"
+#line 10873 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10934: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10877: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10940: \$? = $ac_status" >&5
+  echo "$as_me:10883: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10956,7 +10899,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10959: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:10902: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10966,7 +10909,7 @@ EOF
 fi
 done
 
- echo "$as_me:10969: checking for working chown" >&5
+ echo "$as_me:10912: checking for working chown" >&5
 echo $ECHO_N "checking for working chown... $ECHO_C" >&6
 if test "${jm_cv_func_working_chown+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10975,7 +10918,7 @@ else
   	     jm_cv_func_working_chown=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10978 "configure"
+#line 10921 "configure"
 #include "confdefs.h"
 
 #   include <sys/types.h>
@@ -11005,15 +10948,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11011: \$? = $ac_status" >&5
+  echo "$as_me:10954: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11016: \$? = $ac_status" >&5
+  echo "$as_me:10959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_chown=yes
 else
@@ -11022,11 +10965,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_chown=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:11029: result: $jm_cv_func_working_chown" >&5
+echo "$as_me:10972: result: $jm_cv_func_working_chown" >&5
 echo "${ECHO_T}$jm_cv_func_working_chown" >&6
   if test $jm_cv_func_working_chown = no; then
     LIBOBJS="$LIBOBJS chown.$ac_objext"
@@ -11040,23 +10983,23 @@ EOF
 for ac_header in sys/time.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:11043: checking for $ac_header" >&5
+echo "$as_me:10986: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11049 "configure"
+#line 10992 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11053: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10996: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11059: \$? = $ac_status" >&5
+  echo "$as_me:11002: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11075,7 +11018,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11078: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:11021: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11088,13 +11031,13 @@ done
 for ac_func in alarm
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:11091: checking for $ac_func" >&5
+echo "$as_me:11034: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11097 "configure"
+#line 11040 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11125,16 +11068,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11131: \$? = $ac_status" >&5
+  echo "$as_me:11074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11137: \$? = $ac_status" >&5
+  echo "$as_me:11080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -11144,7 +11087,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11147: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:11090: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11154,7 +11097,7 @@ EOF
 fi
 done
 
-echo "$as_me:11157: checking for working mktime" >&5
+echo "$as_me:11100: checking for working mktime" >&5
 echo $ECHO_N "checking for working mktime... $ECHO_C" >&6
 if test "${ac_cv_func_working_mktime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11163,7 +11106,7 @@ else
   ac_cv_func_working_mktime=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11166 "configure"
+#line 11109 "configure"
 #include "confdefs.h"
 /* Test program from Paul Eggert and Tony Leneis.  */
 #if TIME_WITH_SYS_TIME
@@ -11312,15 +11255,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11318: \$? = $ac_status" >&5
+  echo "$as_me:11261: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11323: \$? = $ac_status" >&5
+  echo "$as_me:11266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_working_mktime=yes
 else
@@ -11329,10 +11272,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_working_mktime=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:11335: result: $ac_cv_func_working_mktime" >&5
+echo "$as_me:11278: result: $ac_cv_func_working_mktime" >&5
 echo "${ECHO_T}$ac_cv_func_working_mktime" >&6
 if test $ac_cv_func_working_mktime = no; then
   LIBOBJS="$LIBOBJS mktime.$ac_objext"
@@ -11341,13 +11284,13 @@ fi
 for ac_func in localtime_r
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:11344: checking for $ac_func" >&5
+echo "$as_me:11287: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11350 "configure"
+#line 11293 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11378,16 +11321,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11384: \$? = $ac_status" >&5
+  echo "$as_me:11327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11390: \$? = $ac_status" >&5
+  echo "$as_me:11333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -11397,7 +11340,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11400: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:11343: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11415,19 +11358,19 @@ EOF
 
  fi
 
-echo "$as_me:11418: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
+echo "$as_me:11361: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
 echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
 if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  rm -f conftest.sym conftest.file
-echo >conftest.file
-if ln -s conftest.file conftest.sym; then
+  rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ && test ! -f conf$$.exe; then
   if test "$cross_compiling" = yes; then
   ac_cv_func_lstat_dereferences_slashed_symlink=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11430 "configure"
+#line 11373 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -11438,21 +11381,21 @@ struct stat sbuf;
      /* Linux will dereference the symlink and fail.
         That is better in the sense that it means we will not
         have to compile and use the lstat wrapper.  */
-     exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1);
+     exit (lstat ("conf$$/", &sbuf) ? 0 : 1);
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11450: \$? = $ac_status" >&5
+  echo "$as_me:11393: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11455: \$? = $ac_status" >&5
+  echo "$as_me:11398: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat_dereferences_slashed_symlink=yes
 else
@@ -11461,17 +11404,17 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 else
   # If the `ln -s' command failed, then we probably don't even
   # have an lstat function.
   ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
-rm -f conftest.sym conftest.file
+rm -f conf$$ conf$$.exe conf$$.file
 
 fi
-echo "$as_me:11474: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+echo "$as_me:11417: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
 echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
 
 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
@@ -11484,7 +11427,7 @@ if test $ac_cv_func_lstat_dereferences_s
   LIBOBJS="$LIBOBJS lstat.$ac_objext"
 fi
 
- echo "$as_me:11487: checking whether lstat accepts an empty string" >&5
+ echo "$as_me:11430: checking whether lstat accepts an empty string" >&5
 echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6
 if test "${jm_cv_func_lstat_empty_string_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11493,7 +11436,7 @@ else
   	 jm_cv_func_lstat_empty_string_bug=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11496 "configure"
+#line 11439 "configure"
 #include "confdefs.h"
 
 #   include <sys/types.h>
@@ -11508,15 +11451,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11514: \$? = $ac_status" >&5
+  echo "$as_me:11457: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11519: \$? = $ac_status" >&5
+  echo "$as_me:11462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_lstat_empty_string_bug=yes
 else
@@ -11525,11 +11468,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_lstat_empty_string_bug=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:11532: result: $jm_cv_func_lstat_empty_string_bug" >&5
+echo "$as_me:11475: result: $jm_cv_func_lstat_empty_string_bug" >&5
 echo "${ECHO_T}$jm_cv_func_lstat_empty_string_bug" >&6
   if test $jm_cv_func_lstat_empty_string_bug = yes; then
     LIBOBJS="$LIBOBJS lstat.$ac_objext"
@@ -11540,7 +11483,7 @@ EOF
 
   fi
 
- echo "$as_me:11543: checking whether stat accepts an empty string" >&5
+ echo "$as_me:11486: checking whether stat accepts an empty string" >&5
 echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6
 if test "${jm_cv_func_stat_empty_string_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11549,7 +11492,7 @@ else
   	 jm_cv_func_stat_empty_string_bug=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11552 "configure"
+#line 11495 "configure"
 #include "confdefs.h"
 
 #   include <sys/types.h>
@@ -11564,15 +11507,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11570: \$? = $ac_status" >&5
+  echo "$as_me:11513: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11575: \$? = $ac_status" >&5
+  echo "$as_me:11518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_stat_empty_string_bug=yes
 else
@@ -11581,11 +11524,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_stat_empty_string_bug=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:11588: result: $jm_cv_func_stat_empty_string_bug" >&5
+echo "$as_me:11531: result: $jm_cv_func_stat_empty_string_bug" >&5
 echo "${ECHO_T}$jm_cv_func_stat_empty_string_bug" >&6
   if test $jm_cv_func_stat_empty_string_bug = yes; then
     LIBOBJS="$LIBOBJS stat.$ac_objext"
@@ -11600,7 +11543,7 @@ cat >>confdefs.h <<EOF
 #define HAVE_DONE_WORKING_REALLOC_CHECK 1
 EOF
 
- echo "$as_me:11603: checking for working realloc" >&5
+ echo "$as_me:11546: checking for working realloc" >&5
 echo $ECHO_N "checking for working realloc... $ECHO_C" >&6
 if test "${jm_cv_func_working_realloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11609,7 +11552,7 @@ else
   	 jm_cv_func_working_realloc=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11612 "configure"
+#line 11555 "configure"
 #include "confdefs.h"
 
     char *realloc ();
@@ -11621,15 +11564,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11627: \$? = $ac_status" >&5
+  echo "$as_me:11570: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11632: \$? = $ac_status" >&5
+  echo "$as_me:11575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_realloc=yes
 else
@@ -11638,11 +11581,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_realloc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:11645: result: $jm_cv_func_working_realloc" >&5
+echo "$as_me:11588: result: $jm_cv_func_working_realloc" >&5
 echo "${ECHO_T}$jm_cv_func_working_realloc" >&6
   if test $jm_cv_func_working_realloc = no; then
     LIBOBJS="$LIBOBJS realloc.$ac_objext"
@@ -11657,7 +11600,7 @@ cat >>confdefs.h <<EOF
 #define HAVE_DONE_WORKING_MALLOC_CHECK 1
 EOF
 
- echo "$as_me:11660: checking for working malloc" >&5
+ echo "$as_me:11603: checking for working malloc" >&5
 echo $ECHO_N "checking for working malloc... $ECHO_C" >&6
 if test "${jm_cv_func_working_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11666,7 +11609,7 @@ else
   	 jm_cv_func_working_malloc=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11669 "configure"
+#line 11612 "configure"
 #include "confdefs.h"
 
     char *malloc ();
@@ -11678,15 +11621,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11684: \$? = $ac_status" >&5
+  echo "$as_me:11627: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11689: \$? = $ac_status" >&5
+  echo "$as_me:11632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_malloc=yes
 else
@@ -11695,11 +11638,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_malloc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:11702: result: $jm_cv_func_working_malloc" >&5
+echo "$as_me:11645: result: $jm_cv_func_working_malloc" >&5
 echo "${ECHO_T}$jm_cv_func_working_malloc" >&6
   if test $jm_cv_func_working_malloc = no; then
     LIBOBJS="$LIBOBJS malloc.$ac_objext"
@@ -11715,7 +11658,7 @@ EOF
  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
  # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
 
-  echo "$as_me:11718: checking for library containing nanosleep" >&5
+  echo "$as_me:11661: checking for library containing nanosleep" >&5
 echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6
 if test "${ac_cv_search_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11724,7 +11667,7 @@ else
     ac_func_search_save_LIBS=$LIBS
     ac_cv_search_nanosleep=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 11727 "configure"
+#line 11670 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11743,16 +11686,16 @@ nanosleep ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11749: \$? = $ac_status" >&5
+  echo "$as_me:11692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11755: \$? = $ac_status" >&5
+  echo "$as_me:11698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_nanosleep='none required'
 else
@@ -11764,7 +11707,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       for ac_lib in rt posix4; do
 	LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11767 "configure"
+#line 11710 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11783,16 +11726,16 @@ nanosleep ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11789: \$? = $ac_status" >&5
+  echo "$as_me:11732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11795: \$? = $ac_status" >&5
+  echo "$as_me:11738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_nanosleep="-l$ac_lib"; break
 else
@@ -11805,7 +11748,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     LIBS=$ac_func_search_save_LIBS
 
 fi
-echo "$as_me:11808: result: $ac_cv_search_nanosleep" >&5
+echo "$as_me:11751: result: $ac_cv_search_nanosleep" >&5
 echo "${ECHO_T}$ac_cv_search_nanosleep" >&6
 
   if test "$ac_cv_search_nanosleep" = no; then :
@@ -11819,7 +11762,7 @@ echo "${ECHO_T}$ac_cv_search_nanosleep" 
     fi
   fi
 
- echo "$as_me:11822: checking whether nanosleep works" >&5
+ echo "$as_me:11765: checking whether nanosleep works" >&5
 echo $ECHO_N "checking whether nanosleep works... $ECHO_C" >&6
 if test "${jm_cv_func_nanosleep_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11829,7 +11772,7 @@ else
   	 jm_cv_func_nanosleep_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11832 "configure"
+#line 11775 "configure"
 #include "confdefs.h"
 
 #   if TIME_WITH_SYS_TIME
@@ -11854,15 +11797,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11860: \$? = $ac_status" >&5
+  echo "$as_me:11803: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11865: \$? = $ac_status" >&5
+  echo "$as_me:11808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_nanosleep_works=yes
 else
@@ -11871,11 +11814,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_nanosleep_works=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:11878: result: $jm_cv_func_nanosleep_works" >&5
+echo "$as_me:11821: result: $jm_cv_func_nanosleep_works" >&5
 echo "${ECHO_T}$jm_cv_func_nanosleep_works" >&6
   if test $jm_cv_func_nanosleep_works = no; then
     LIBOBJS="$LIBOBJS nanosleep.$ac_objext"
@@ -11891,23 +11834,23 @@ EOF
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:11894: checking for $ac_header" >&5
+echo "$as_me:11837: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11900 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11904: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11847: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11910: \$? = $ac_status" >&5
+  echo "$as_me:11853: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11926,7 +11869,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11929: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:11872: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -11936,7 +11879,7 @@ EOF
 fi
 done
 
-echo "$as_me:11939: checking for working readdir" >&5
+echo "$as_me:11882: checking for working readdir" >&5
 echo $ECHO_N "checking for working readdir... $ECHO_C" >&6
 if test "${jm_cv_func_working_readdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11949,7 +11892,7 @@ else
   jm_cv_func_working_readdir=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11952 "configure"
+#line 11895 "configure"
 #include "confdefs.h"
 #   include <stdio.h>
 #   include <sys/types.h>
@@ -12048,15 +11991,15 @@ else
     }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12054: \$? = $ac_status" >&5
+  echo "$as_me:11997: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12059: \$? = $ac_status" >&5
+  echo "$as_me:12002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_readdir=yes
 else
@@ -12065,10 +12008,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_readdir=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12071: result: $jm_cv_func_working_readdir" >&5
+echo "$as_me:12014: result: $jm_cv_func_working_readdir" >&5
 echo "${ECHO_T}$jm_cv_func_working_readdir" >&6
 
   if test $jm_cv_func_working_readdir = yes; then
@@ -12079,7 +12022,7 @@ EOF
 
   fi
 
-echo "$as_me:12082: checking for working memcmp" >&5
+echo "$as_me:12025: checking for working memcmp" >&5
 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
 if test "${ac_cv_func_memcmp_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12088,7 +12031,7 @@ else
   ac_cv_func_memcmp_working=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12091 "configure"
+#line 12034 "configure"
 #include "confdefs.h"
 
 int
@@ -12124,15 +12067,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12070: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12130: \$? = $ac_status" >&5
+  echo "$as_me:12073: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12135: \$? = $ac_status" >&5
+  echo "$as_me:12078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
@@ -12141,10 +12084,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_memcmp_working=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:12147: result: $ac_cv_func_memcmp_working" >&5
+echo "$as_me:12090: result: $ac_cv_func_memcmp_working" >&5
 echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
 test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 
@@ -12158,13 +12101,13 @@ EOF
 
     # Kludge (not executed) to make autoheader do the right thing.
     if test a = b; then
-      echo "$as_me:12161: checking whether clearerr_unlocked is declared" >&5
+      echo "$as_me:12104: checking whether clearerr_unlocked is declared" >&5
 echo $ECHO_N "checking whether clearerr_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_clearerr_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12167 "configure"
+#line 12110 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12179,16 +12122,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12185: \$? = $ac_status" >&5
+  echo "$as_me:12128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12191: \$? = $ac_status" >&5
+  echo "$as_me:12134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_clearerr_unlocked=yes
 else
@@ -12198,7 +12141,7 @@ ac_cv_have_decl_clearerr_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12201: result: $ac_cv_have_decl_clearerr_unlocked" >&5
+echo "$as_me:12144: result: $ac_cv_have_decl_clearerr_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_clearerr_unlocked" >&6
 if test $ac_cv_have_decl_clearerr_unlocked = yes; then
 
@@ -12212,13 +12155,13 @@ else
 EOF
 
 fi
-echo "$as_me:12215: checking whether feof_unlocked is declared" >&5
+echo "$as_me:12158: checking whether feof_unlocked is declared" >&5
 echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12221 "configure"
+#line 12164 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12233,16 +12176,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12239: \$? = $ac_status" >&5
+  echo "$as_me:12182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12245: \$? = $ac_status" >&5
+  echo "$as_me:12188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_feof_unlocked=yes
 else
@@ -12252,7 +12195,7 @@ ac_cv_have_decl_feof_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12255: result: $ac_cv_have_decl_feof_unlocked" >&5
+echo "$as_me:12198: result: $ac_cv_have_decl_feof_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
 if test $ac_cv_have_decl_feof_unlocked = yes; then
 
@@ -12266,13 +12209,13 @@ else
 EOF
 
 fi
-echo "$as_me:12269: checking whether ferror_unlocked is declared" >&5
+echo "$as_me:12212: checking whether ferror_unlocked is declared" >&5
 echo $ECHO_N "checking whether ferror_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_ferror_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12275 "configure"
+#line 12218 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12287,16 +12230,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12299: \$? = $ac_status" >&5
+  echo "$as_me:12242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_ferror_unlocked=yes
 else
@@ -12306,7 +12249,7 @@ ac_cv_have_decl_ferror_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12309: result: $ac_cv_have_decl_ferror_unlocked" >&5
+echo "$as_me:12252: result: $ac_cv_have_decl_ferror_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_ferror_unlocked" >&6
 if test $ac_cv_have_decl_ferror_unlocked = yes; then
 
@@ -12320,13 +12263,13 @@ else
 EOF
 
 fi
-echo "$as_me:12323: checking whether fflush_unlocked is declared" >&5
+echo "$as_me:12266: checking whether fflush_unlocked is declared" >&5
 echo $ECHO_N "checking whether fflush_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_fflush_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12329 "configure"
+#line 12272 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12341,16 +12284,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12347: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12353: \$? = $ac_status" >&5
+  echo "$as_me:12296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_fflush_unlocked=yes
 else
@@ -12360,7 +12303,7 @@ ac_cv_have_decl_fflush_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12363: result: $ac_cv_have_decl_fflush_unlocked" >&5
+echo "$as_me:12306: result: $ac_cv_have_decl_fflush_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_fflush_unlocked" >&6
 if test $ac_cv_have_decl_fflush_unlocked = yes; then
 
@@ -12374,13 +12317,13 @@ else
 EOF
 
 fi
-echo "$as_me:12377: checking whether fputc_unlocked is declared" >&5
+echo "$as_me:12320: checking whether fputc_unlocked is declared" >&5
 echo $ECHO_N "checking whether fputc_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_fputc_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12383 "configure"
+#line 12326 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12395,16 +12338,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12401: \$? = $ac_status" >&5
+  echo "$as_me:12344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12407: \$? = $ac_status" >&5
+  echo "$as_me:12350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_fputc_unlocked=yes
 else
@@ -12414,7 +12357,7 @@ ac_cv_have_decl_fputc_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12417: result: $ac_cv_have_decl_fputc_unlocked" >&5
+echo "$as_me:12360: result: $ac_cv_have_decl_fputc_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_fputc_unlocked" >&6
 if test $ac_cv_have_decl_fputc_unlocked = yes; then
 
@@ -12428,13 +12371,13 @@ else
 EOF
 
 fi
-echo "$as_me:12431: checking whether fread_unlocked is declared" >&5
+echo "$as_me:12374: checking whether fread_unlocked is declared" >&5
 echo $ECHO_N "checking whether fread_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_fread_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12437 "configure"
+#line 12380 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12449,16 +12392,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12395: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12455: \$? = $ac_status" >&5
+  echo "$as_me:12398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12461: \$? = $ac_status" >&5
+  echo "$as_me:12404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_fread_unlocked=yes
 else
@@ -12468,7 +12411,7 @@ ac_cv_have_decl_fread_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12471: result: $ac_cv_have_decl_fread_unlocked" >&5
+echo "$as_me:12414: result: $ac_cv_have_decl_fread_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_fread_unlocked" >&6
 if test $ac_cv_have_decl_fread_unlocked = yes; then
 
@@ -12482,13 +12425,13 @@ else
 EOF
 
 fi
-echo "$as_me:12485: checking whether fwrite_unlocked is declared" >&5
+echo "$as_me:12428: checking whether fwrite_unlocked is declared" >&5
 echo $ECHO_N "checking whether fwrite_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_fwrite_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12491 "configure"
+#line 12434 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12503,16 +12446,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12509: \$? = $ac_status" >&5
+  echo "$as_me:12452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12515: \$? = $ac_status" >&5
+  echo "$as_me:12458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_fwrite_unlocked=yes
 else
@@ -12522,7 +12465,7 @@ ac_cv_have_decl_fwrite_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12525: result: $ac_cv_have_decl_fwrite_unlocked" >&5
+echo "$as_me:12468: result: $ac_cv_have_decl_fwrite_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_fwrite_unlocked" >&6
 if test $ac_cv_have_decl_fwrite_unlocked = yes; then
 
@@ -12536,13 +12479,13 @@ else
 EOF
 
 fi
-echo "$as_me:12539: checking whether getc_unlocked is declared" >&5
+echo "$as_me:12482: checking whether getc_unlocked is declared" >&5
 echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12545 "configure"
+#line 12488 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12557,16 +12500,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12563: \$? = $ac_status" >&5
+  echo "$as_me:12506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12569: \$? = $ac_status" >&5
+  echo "$as_me:12512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getc_unlocked=yes
 else
@@ -12576,7 +12519,7 @@ ac_cv_have_decl_getc_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12579: result: $ac_cv_have_decl_getc_unlocked" >&5
+echo "$as_me:12522: result: $ac_cv_have_decl_getc_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
 if test $ac_cv_have_decl_getc_unlocked = yes; then
 
@@ -12590,13 +12533,13 @@ else
 EOF
 
 fi
-echo "$as_me:12593: checking whether getchar_unlocked is declared" >&5
+echo "$as_me:12536: checking whether getchar_unlocked is declared" >&5
 echo $ECHO_N "checking whether getchar_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getchar_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12599 "configure"
+#line 12542 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12611,16 +12554,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12617: \$? = $ac_status" >&5
+  echo "$as_me:12560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getchar_unlocked=yes
 else
@@ -12630,7 +12573,7 @@ ac_cv_have_decl_getchar_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12633: result: $ac_cv_have_decl_getchar_unlocked" >&5
+echo "$as_me:12576: result: $ac_cv_have_decl_getchar_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getchar_unlocked" >&6
 if test $ac_cv_have_decl_getchar_unlocked = yes; then
 
@@ -12644,13 +12587,13 @@ else
 EOF
 
 fi
-echo "$as_me:12647: checking whether putc_unlocked is declared" >&5
+echo "$as_me:12590: checking whether putc_unlocked is declared" >&5
 echo $ECHO_N "checking whether putc_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_putc_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12653 "configure"
+#line 12596 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12665,16 +12608,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12671: \$? = $ac_status" >&5
+  echo "$as_me:12614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12677: \$? = $ac_status" >&5
+  echo "$as_me:12620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_putc_unlocked=yes
 else
@@ -12684,7 +12627,7 @@ ac_cv_have_decl_putc_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12687: result: $ac_cv_have_decl_putc_unlocked" >&5
+echo "$as_me:12630: result: $ac_cv_have_decl_putc_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_putc_unlocked" >&6
 if test $ac_cv_have_decl_putc_unlocked = yes; then
 
@@ -12698,13 +12641,13 @@ else
 EOF
 
 fi
-echo "$as_me:12701: checking whether putchar_unlocked is declared" >&5
+echo "$as_me:12644: checking whether putchar_unlocked is declared" >&5
 echo $ECHO_N "checking whether putchar_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_putchar_unlocked+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12707 "configure"
+#line 12650 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12719,16 +12662,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12725: \$? = $ac_status" >&5
+  echo "$as_me:12668: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12731: \$? = $ac_status" >&5
+  echo "$as_me:12674: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_putchar_unlocked=yes
 else
@@ -12738,7 +12681,7 @@ ac_cv_have_decl_putchar_unlocked=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12741: result: $ac_cv_have_decl_putchar_unlocked" >&5
+echo "$as_me:12684: result: $ac_cv_have_decl_putchar_unlocked" >&5
 echo "${ECHO_T}$ac_cv_have_decl_putchar_unlocked" >&6
 if test $ac_cv_have_decl_putchar_unlocked = yes; then
 
@@ -12764,13 +12707,13 @@ fi
       # declared, and that have been removed from Solaris5.6.  The resulting
       # 5.5.1 binaries would not run on 5.6 due to shared library differences.
       ac_ac_Symbol=`echo "ac_cv_have_decl_$jm_io_func" | $ac_tr_sh`
-echo "$as_me:12767: checking whether $jm_io_func is declared" >&5
+echo "$as_me:12710: checking whether $jm_io_func is declared" >&5
 echo $ECHO_N "checking whether $jm_io_func is declared... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Symbol+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12773 "configure"
+#line 12716 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 
@@ -12786,16 +12729,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12732: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12792: \$? = $ac_status" >&5
+  echo "$as_me:12735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12798: \$? = $ac_status" >&5
+  echo "$as_me:12741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_Symbol=yes"
 else
@@ -12805,7 +12748,7 @@ eval "$ac_ac_Symbol=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12808: result: `eval echo '${'$ac_ac_Symbol'}'`" >&5
+echo "$as_me:12751: result: `eval echo '${'$ac_ac_Symbol'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Symbol'}'`" >&6
 if test `eval echo '${'$ac_ac_Symbol'}'` = yes; then
 
@@ -12827,13 +12770,13 @@ fi
 for ac_func in $jm_io_func
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:12830: checking for $ac_func" >&5
+echo "$as_me:12773: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12836 "configure"
+#line 12779 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12864,16 +12807,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12870: \$? = $ac_status" >&5
+  echo "$as_me:12813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12876: \$? = $ac_status" >&5
+  echo "$as_me:12819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -12883,7 +12826,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12886: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:12829: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -12896,13 +12839,13 @@ done
       fi
     done
 
-    echo "$as_me:12899: checking whether we are using the GNU C Library" >&5
+    echo "$as_me:12842: checking whether we are using the GNU C Library" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library... $ECHO_C" >&6
 if test "${ac_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12905 "configure"
+#line 12848 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -12920,15 +12863,15 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:12923: result: $ac_cv_gnu_library" >&5
+echo "$as_me:12866: result: $ac_cv_gnu_library" >&5
 echo "${ECHO_T}$ac_cv_gnu_library" >&6
-    echo "$as_me:12925: checking for version 2 of the GNU C Library" >&5
+    echo "$as_me:12868: checking for version 2 of the GNU C Library" >&5
 echo $ECHO_N "checking for version 2 of the GNU C Library... $ECHO_C" >&6
 if test "${ac_cv_glibc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12931 "configure"
+#line 12874 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -12946,10 +12889,10 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:12949: result: $ac_cv_glibc" >&5
+echo "$as_me:12892: result: $ac_cv_glibc" >&5
 echo "${ECHO_T}$ac_cv_glibc" >&6
 
-  echo "$as_me:12952: checking for working GNU-style fnmatch" >&5
+  echo "$as_me:12895: checking for working GNU-style fnmatch" >&5
 echo $ECHO_N "checking for working GNU-style fnmatch... $ECHO_C" >&6
 if test "${ac_cv_func_fnmatch_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12962,7 +12905,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_fnmatch_works=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12965 "configure"
+#line 12908 "configure"
 #include "confdefs.h"
 #include <fnmatch.h>
 int
@@ -12978,15 +12921,15 @@ exit (fnmatch ("a*", "abc", 0) != 0
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12984: \$? = $ac_status" >&5
+  echo "$as_me:12927: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12989: \$? = $ac_status" >&5
+  echo "$as_me:12932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fnmatch_works=yes
 else
@@ -12995,10 +12938,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_fnmatch_works=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:13001: result: $ac_cv_func_fnmatch_works" >&5
+echo "$as_me:12944: result: $ac_cv_func_fnmatch_works" >&5
 echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6
 if test $ac_cv_func_fnmatch_works = yes; then
 
@@ -13018,13 +12961,13 @@ EOF
 
   fi
 
-            echo "$as_me:13021: checking for group_member" >&5
+            echo "$as_me:12964: checking for group_member" >&5
 echo $ECHO_N "checking for group_member... $ECHO_C" >&6
 if test "${ac_cv_func_group_member+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13027 "configure"
+#line 12970 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char group_member (); below.  */
@@ -13055,16 +12998,16 @@ f = group_member;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13001: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13061: \$? = $ac_status" >&5
+  echo "$as_me:13004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13067: \$? = $ac_status" >&5
+  echo "$as_me:13010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_group_member=yes
 else
@@ -13074,7 +13017,7 @@ ac_cv_func_group_member=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13077: result: $ac_cv_func_group_member" >&5
+echo "$as_me:13020: result: $ac_cv_func_group_member" >&5
 echo "${ECHO_T}$ac_cv_func_group_member" >&6
 if test $ac_cv_func_group_member = yes; then
   :
@@ -13082,7 +13025,7 @@ else
   LIBOBJS="$LIBOBJS group-member.$ac_objext"
 fi
 
-echo "$as_me:13085: checking for SVID conformant putenv" >&5
+echo "$as_me:13028: checking for SVID conformant putenv" >&5
 echo $ECHO_N "checking for SVID conformant putenv... $ECHO_C" >&6
 if test "${jm_cv_func_svid_putenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13091,7 +13034,7 @@ else
   	     jm_cv_func_svid_putenv=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13094 "configure"
+#line 13037 "configure"
 #include "confdefs.h"
 
     int
@@ -13114,15 +13057,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13120: \$? = $ac_status" >&5
+  echo "$as_me:13063: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13125: \$? = $ac_status" >&5
+  echo "$as_me:13068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_svid_putenv=yes
 else
@@ -13131,11 +13074,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_svid_putenv=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:13138: result: $jm_cv_func_svid_putenv" >&5
+echo "$as_me:13081: result: $jm_cv_func_svid_putenv" >&5
 echo "${ECHO_T}$jm_cv_func_svid_putenv" >&6
   if test $jm_cv_func_svid_putenv = no; then
     LIBOBJS="$LIBOBJS putenv.$ac_objext"
@@ -13146,7 +13089,7 @@ EOF
 
   fi
 
-echo "$as_me:13149: checking for AFS" >&5
+echo "$as_me:13092: checking for AFS" >&5
 echo $ECHO_N "checking for AFS... $ECHO_C" >&6
   if test -d /afs; then
 
@@ -13158,16 +13101,16 @@ EOF
   else
     ac_result=no
   fi
-  echo "$as_me:13161: result: $ac_result" >&5
+  echo "$as_me:13104: result: $ac_result" >&5
 echo "${ECHO_T}$ac_result" >&6
 
-  echo "$as_me:13164: checking whether strtoul is declared" >&5
+  echo "$as_me:13107: checking whether strtoul is declared" >&5
 echo $ECHO_N "checking whether strtoul is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strtoul+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13170 "configure"
+#line 13113 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13182,16 +13125,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13188: \$? = $ac_status" >&5
+  echo "$as_me:13131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13194: \$? = $ac_status" >&5
+  echo "$as_me:13137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strtoul=yes
 else
@@ -13201,7 +13144,7 @@ ac_cv_have_decl_strtoul=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13204: result: $ac_cv_have_decl_strtoul" >&5
+echo "$as_me:13147: result: $ac_cv_have_decl_strtoul" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strtoul" >&6
 if test $ac_cv_have_decl_strtoul = yes; then
 
@@ -13215,13 +13158,13 @@ else
 EOF
 
 fi
-echo "$as_me:13218: checking whether strtoull is declared" >&5
+echo "$as_me:13161: checking whether strtoull is declared" >&5
 echo $ECHO_N "checking whether strtoull is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strtoull+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13224 "configure"
+#line 13167 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13236,16 +13179,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13242: \$? = $ac_status" >&5
+  echo "$as_me:13185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13248: \$? = $ac_status" >&5
+  echo "$as_me:13191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strtoull=yes
 else
@@ -13255,7 +13198,7 @@ ac_cv_have_decl_strtoull=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13258: result: $ac_cv_have_decl_strtoull" >&5
+echo "$as_me:13201: result: $ac_cv_have_decl_strtoull" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strtoull" >&6
 if test $ac_cv_have_decl_strtoull = yes; then
 
@@ -13273,23 +13216,23 @@ fi
 for ac_header in limits.h stdlib.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:13276: checking for $ac_header" >&5
+echo "$as_me:13219: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13282 "configure"
+#line 13225 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13286: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13229: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13292: \$? = $ac_status" >&5
+  echo "$as_me:13235: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13308,7 +13251,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13311: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:13254: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13318,13 +13261,13 @@ EOF
 fi
 done
 
-  echo "$as_me:13321: checking whether <inttypes.h> defines strtoumax as a macro" >&5
+  echo "$as_me:13264: checking whether <inttypes.h> defines strtoumax as a macro" >&5
 echo $ECHO_N "checking whether <inttypes.h> defines strtoumax as a macro... $ECHO_C" >&6
 if test "${jm_cv_func_strtoumax_macro+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13327 "configure"
+#line 13270 "configure"
 #include "confdefs.h"
 #include <inttypes.h>
 #ifdef strtoumax
@@ -13340,7 +13283,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:13343: result: $jm_cv_func_strtoumax_macro" >&5
+echo "$as_me:13286: result: $jm_cv_func_strtoumax_macro" >&5
 echo "${ECHO_T}$jm_cv_func_strtoumax_macro" >&6
 
   if test "$jm_cv_func_strtoumax_macro" != yes; then
@@ -13348,13 +13291,13 @@ echo "${ECHO_T}$jm_cv_func_strtoumax_mac
 for ac_func in strtoumax
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:13351: checking for $ac_func" >&5
+echo "$as_me:13294: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13357 "configure"
+#line 13300 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13385,16 +13328,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13391: \$? = $ac_status" >&5
+  echo "$as_me:13334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13397: \$? = $ac_status" >&5
+  echo "$as_me:13340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -13404,7 +13347,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13407: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:13350: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13424,13 +13367,13 @@ done
 for ac_func in strtoull strtol
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:13427: checking for $ac_func" >&5
+echo "$as_me:13370: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13433 "configure"
+#line 13376 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13461,16 +13404,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13467: \$? = $ac_status" >&5
+  echo "$as_me:13410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13473: \$? = $ac_status" >&5
+  echo "$as_me:13416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -13480,7 +13423,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13483: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:13426: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13501,13 +13444,13 @@ done
 for ac_func in strtoul strtol
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:13504: checking for $ac_func" >&5
+echo "$as_me:13447: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13510 "configure"
+#line 13453 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13538,16 +13481,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13544: \$? = $ac_status" >&5
+  echo "$as_me:13487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13550: \$? = $ac_status" >&5
+  echo "$as_me:13493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -13557,7 +13500,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13560: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:13503: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13572,7 +13515,7 @@ done
       ;;
   esac
 
-  echo "$as_me:13575: checking whether link(2) dereferences a symlink specified with a trailing slash" >&5
+  echo "$as_me:13518: checking whether link(2) dereferences a symlink specified with a trailing slash" >&5
 echo $ECHO_N "checking whether link(2) dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
 if test "${jm_ac_cv_func_link_follows_symlink+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13583,23 +13526,23 @@ else
 for ac_header in unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:13586: checking for $ac_header" >&5
+echo "$as_me:13529: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13592 "configure"
+#line 13535 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13596: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13539: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13602: \$? = $ac_status" >&5
+  echo "$as_me:13545: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13618,7 +13561,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13621: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:13564: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13634,7 +13577,7 @@ done
   jm_ac_cv_func_link_follows_symlink=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13637 "configure"
+#line 13580 "configure"
 #include "confdefs.h"
 
 #       include <sys/types.h>
@@ -13675,15 +13618,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13681: \$? = $ac_status" >&5
+  echo "$as_me:13624: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13686: \$? = $ac_status" >&5
+  echo "$as_me:13629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_ac_cv_func_link_follows_symlink=yes
 else
@@ -13692,11 +13635,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_ac_cv_func_link_follows_symlink=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:13699: result: $jm_ac_cv_func_link_follows_symlink" >&5
+echo "$as_me:13642: result: $jm_ac_cv_func_link_follows_symlink" >&5
 echo "${ECHO_T}$jm_ac_cv_func_link_follows_symlink" >&6
   if test $jm_ac_cv_func_link_follows_symlink = yes; then
 
@@ -13706,13 +13649,13 @@ EOF
 
   fi
 
-echo "$as_me:13709: checking for error_at_line" >&5
+echo "$as_me:13652: checking for error_at_line" >&5
 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6
 if test "${am_cv_lib_error_at_line+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13715 "configure"
+#line 13658 "configure"
 #include "confdefs.h"
 
 int
@@ -13724,16 +13667,16 @@ error_at_line(0, 0, "", 0, "");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13730: \$? = $ac_status" >&5
+  echo "$as_me:13673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13736: \$? = $ac_status" >&5
+  echo "$as_me:13679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_lib_error_at_line=yes
 else
@@ -13743,7 +13686,7 @@ am_cv_lib_error_at_line=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13746: result: $am_cv_lib_error_at_line" >&5
+echo "$as_me:13689: result: $am_cv_lib_error_at_line" >&5
 echo "${ECHO_T}$am_cv_lib_error_at_line" >&6
  if test $am_cv_lib_error_at_line = no; then
    LIBOBJS="$LIBOBJS error.$ac_objext"
@@ -13752,13 +13695,13 @@ echo "${ECHO_T}$am_cv_lib_error_at_line"
 for ac_func in localtime_r strftime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:13755: checking for $ac_func" >&5
+echo "$as_me:13698: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13761 "configure"
+#line 13704 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13789,16 +13732,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13795: \$? = $ac_status" >&5
+  echo "$as_me:13738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13801: \$? = $ac_status" >&5
+  echo "$as_me:13744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -13808,7 +13751,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13811: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:13754: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13821,23 +13764,23 @@ done
 for ac_header in limits.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:13824: checking for $ac_header" >&5
+echo "$as_me:13767: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13830 "configure"
+#line 13773 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13834: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13777: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13840: \$? = $ac_status" >&5
+  echo "$as_me:13783: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13856,7 +13799,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:13859: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:13802: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13869,13 +13812,13 @@ done
 for ac_func in bcopy tzset mempcpy memcpy memset
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:13872: checking for $ac_func" >&5
+echo "$as_me:13815: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13878 "configure"
+#line 13821 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13906,16 +13849,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13912: \$? = $ac_status" >&5
+  echo "$as_me:13855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13918: \$? = $ac_status" >&5
+  echo "$as_me:13861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -13925,7 +13868,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13928: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:13871: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -13936,13 +13879,13 @@ fi
 done
 
  # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
- echo "$as_me:13939: checking for struct tm.tm_zone" >&5
+ echo "$as_me:13882: checking for struct tm.tm_zone" >&5
 echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
 if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13945 "configure"
+#line 13888 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -13957,16 +13900,16 @@ foo.tm_zone;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13963: \$? = $ac_status" >&5
+  echo "$as_me:13906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13969: \$? = $ac_status" >&5
+  echo "$as_me:13912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_zone=yes
 else
@@ -13976,7 +13919,7 @@ ac_cv_member_struct_tm_tm_zone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13979: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "$as_me:13922: result: $ac_cv_member_struct_tm_tm_zone" >&5
 echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
 if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
@@ -13993,13 +13936,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-  echo "$as_me:13996: checking for tzname" >&5
+  echo "$as_me:13939: checking for tzname" >&5
 echo $ECHO_N "checking for tzname... $ECHO_C" >&6
 if test "${ac_cv_var_tzname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14002 "configure"
+#line 13945 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -14015,16 +13958,16 @@ atoi(*tzname);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14021: \$? = $ac_status" >&5
+  echo "$as_me:13964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14027: \$? = $ac_status" >&5
+  echo "$as_me:13970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_var_tzname=yes
 else
@@ -14034,7 +13977,7 @@ ac_cv_var_tzname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14037: result: $ac_cv_var_tzname" >&5
+echo "$as_me:13980: result: $ac_cv_var_tzname" >&5
 echo "${ECHO_T}$ac_cv_var_tzname" >&6
   if test $ac_cv_var_tzname = yes; then
 
@@ -14048,13 +13991,13 @@ fi
 for ac_func in mblen mbrlen
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:14051: checking for $ac_func" >&5
+echo "$as_me:13994: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14057 "configure"
+#line 14000 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14085,16 +14028,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14031: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14091: \$? = $ac_status" >&5
+  echo "$as_me:14034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14097: \$? = $ac_status" >&5
+  echo "$as_me:14040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -14104,7 +14047,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14107: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:14050: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14114,13 +14057,13 @@ EOF
 fi
 done
 
- echo "$as_me:14117: checking for struct tm.tm_gmtoff" >&5
+ echo "$as_me:14060: checking for struct tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6
 if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14123 "configure"
+#line 14066 "configure"
 #include "confdefs.h"
 #include <time.h>
 
@@ -14134,16 +14077,16 @@ foo.tm_gmtoff;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14140: \$? = $ac_status" >&5
+  echo "$as_me:14083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14146: \$? = $ac_status" >&5
+  echo "$as_me:14089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_tm_tm_gmtoff=yes
 else
@@ -14153,7 +14096,7 @@ ac_cv_member_struct_tm_tm_gmtoff=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14156: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
+echo "$as_me:14099: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
 echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6
 if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
 
@@ -14166,23 +14109,23 @@ fi
 for ac_header in sys/time.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:14169: checking for $ac_header" >&5
+echo "$as_me:14112: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14175 "configure"
+#line 14118 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14179: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14122: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14185: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14201,7 +14144,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14204: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:14147: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14211,7 +14154,7 @@ EOF
 fi
 done
 
- echo "$as_me:14214: checking for working GNU strftime" >&5
+ echo "$as_me:14157: checking for working GNU strftime" >&5
 echo $ECHO_N "checking for working GNU strftime... $ECHO_C" >&6
 if test "${jm_cv_func_working_gnu_strftime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14220,7 +14163,7 @@ else
   	     jm_cv_func_working_gnu_strftime=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14223 "configure"
+#line 14166 "configure"
 #include "confdefs.h"
  /* Ulrich Drepper provided parts of the test program.  */
 #if STDC_HEADERS
@@ -14327,15 +14270,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14333: \$? = $ac_status" >&5
+  echo "$as_me:14276: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14338: \$? = $ac_status" >&5
+  echo "$as_me:14281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_gnu_strftime=yes
 else
@@ -14344,11 +14287,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_gnu_strftime=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:14351: result: $jm_cv_func_working_gnu_strftime" >&5
+echo "$as_me:14294: result: $jm_cv_func_working_gnu_strftime" >&5
 echo "${ECHO_T}$jm_cv_func_working_gnu_strftime" >&6
   if test $jm_cv_func_working_gnu_strftime = no; then
     LIBOBJS="$LIBOBJS strftime.$ac_objext"
@@ -14362,23 +14305,23 @@ EOF
 for ac_header in stdio_ext.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:14365: checking for $ac_header" >&5
+echo "$as_me:14308: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14371 "configure"
+#line 14314 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14375: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14318: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14381: \$? = $ac_status" >&5
+  echo "$as_me:14324: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14397,7 +14340,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14400: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:14343: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14410,13 +14353,13 @@ done
 for ac_func in __fpending
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:14413: checking for $ac_func" >&5
+echo "$as_me:14356: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14419 "configure"
+#line 14362 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14447,16 +14390,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14453: \$? = $ac_status" >&5
+  echo "$as_me:14396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14459: \$? = $ac_status" >&5
+  echo "$as_me:14402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -14466,7 +14409,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14469: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:14412: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14483,13 +14426,13 @@ done
 #      include <stdio_ext.h>
 #     endif
 '
-  echo "$as_me:14486: checking whether __fpending is declared" >&5
+  echo "$as_me:14429: checking whether __fpending is declared" >&5
 echo $ECHO_N "checking whether __fpending is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl___fpending+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14492 "configure"
+#line 14435 "configure"
 #include "confdefs.h"
 $fp_headers
 
@@ -14505,16 +14448,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14451: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14511: \$? = $ac_status" >&5
+  echo "$as_me:14454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14517: \$? = $ac_status" >&5
+  echo "$as_me:14460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl___fpending=yes
 else
@@ -14524,7 +14467,7 @@ ac_cv_have_decl___fpending=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14527: result: $ac_cv_have_decl___fpending" >&5
+echo "$as_me:14470: result: $ac_cv_have_decl___fpending" >&5
 echo "${ECHO_T}$ac_cv_have_decl___fpending" >&6
 if test $ac_cv_have_decl___fpending = yes; then
 
@@ -14540,7 +14483,7 @@ EOF
 fi
 
   if test $ac_cv_func___fpending = no; then
-    echo "$as_me:14543: checking how to determine the number of pending output bytes on a stream" >&5
+    echo "$as_me:14486: checking how to determine the number of pending output bytes on a stream" >&5
 echo $ECHO_N "checking how to determine the number of pending output bytes on a stream... $ECHO_C" >&6
 if test "${ac_cv_sys_pending_output_n_bytes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14579,7 +14522,7 @@ else
 
 	  DEFS="$DEFS -DPENDING_OUTPUT_N_BYTES=$ac_expr"
 	  cat >conftest.$ac_ext <<_ACEOF
-#line 14582 "configure"
+#line 14525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 
@@ -14592,16 +14535,16 @@ FILE *fp = stdin; (void) ($ac_expr);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14598: \$? = $ac_status" >&5
+  echo "$as_me:14541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14604: \$? = $ac_status" >&5
+  echo "$as_me:14547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fp_done=yes
 
@@ -14617,7 +14560,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
 	ac_cv_sys_pending_output_n_bytes=$ac_expr
 
 fi
-echo "$as_me:14620: result: $ac_cv_sys_pending_output_n_bytes" >&5
+echo "$as_me:14563: result: $ac_cv_sys_pending_output_n_bytes" >&5
 echo "${ECHO_T}$ac_cv_sys_pending_output_n_bytes" >&6
 
 cat >>confdefs.h <<EOF
@@ -14629,13 +14572,13 @@ EOF
 for ac_func in getgroups
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:14632: checking for $ac_func" >&5
+echo "$as_me:14575: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14638 "configure"
+#line 14581 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14666,16 +14609,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14672: \$? = $ac_status" >&5
+  echo "$as_me:14615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14678: \$? = $ac_status" >&5
+  echo "$as_me:14621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -14685,7 +14628,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14688: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:14631: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14699,7 +14642,7 @@ done
  # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1.
  if test $ac_cv_func_getgroups = no; then
    jm_cv_sys_getgroups_saved_lib="$LIBS"
-   echo "$as_me:14702: checking for getgroups in -lbsd" >&5
+   echo "$as_me:14645: checking for getgroups in -lbsd" >&5
 echo $ECHO_N "checking for getgroups in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14707,7 +14650,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14710 "configure"
+#line 14653 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14726,16 +14669,16 @@ getgroups ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14732: \$? = $ac_status" >&5
+  echo "$as_me:14675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14738: \$? = $ac_status" >&5
+  echo "$as_me:14681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_getgroups=yes
 else
@@ -14746,7 +14689,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14749: result: $ac_cv_lib_bsd_getgroups" >&5
+echo "$as_me:14692: result: $ac_cv_lib_bsd_getgroups" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_getgroups" >&6
 if test $ac_cv_lib_bsd_getgroups = yes; then
   GETGROUPS_LIB=-lbsd
@@ -14758,7 +14701,7 @@ fi
  # Run the program to test the functionality of the system-supplied
  # getgroups function only if there is such a function.
  if test $ac_cv_func_getgroups = yes; then
-   echo "$as_me:14761: checking for working getgroups" >&5
+   echo "$as_me:14704: checking for working getgroups" >&5
 echo $ECHO_N "checking for working getgroups... $ECHO_C" >&6
 if test "${jm_cv_func_working_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14767,7 +14710,7 @@ else
   	       jm_cv_func_working_getgroups=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14770 "configure"
+#line 14713 "configure"
 #include "confdefs.h"
 
       int
@@ -14779,15 +14722,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14785: \$? = $ac_status" >&5
+  echo "$as_me:14728: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14790: \$? = $ac_status" >&5
+  echo "$as_me:14733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_getgroups=yes
 else
@@ -14796,11 +14739,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_getgroups=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:14803: result: $jm_cv_func_working_getgroups" >&5
+echo "$as_me:14746: result: $jm_cv_func_working_getgroups" >&5
 echo "${ECHO_T}$jm_cv_func_working_getgroups" >&6
     if test $jm_cv_func_working_getgroups = no; then
       LIBOBJS="$LIBOBJS getgroups.$ac_objext"
@@ -14815,13 +14758,13 @@ EOF
 for ac_func in vprintf
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:14818: checking for $ac_func" >&5
+echo "$as_me:14761: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14824 "configure"
+#line 14767 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14852,16 +14795,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14858: \$? = $ac_status" >&5
+  echo "$as_me:14801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14864: \$? = $ac_status" >&5
+  echo "$as_me:14807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -14871,20 +14814,20 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14874: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:14817: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
 EOF
 
-echo "$as_me:14881: checking for _doprnt" >&5
+echo "$as_me:14824: checking for _doprnt" >&5
 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14887 "configure"
+#line 14830 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt (); below.  */
@@ -14915,16 +14858,16 @@ f = _doprnt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14921: \$? = $ac_status" >&5
+  echo "$as_me:14864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14927: \$? = $ac_status" >&5
+  echo "$as_me:14870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__doprnt=yes
 else
@@ -14934,7 +14877,7 @@ ac_cv_func__doprnt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14937: result: $ac_cv_func__doprnt" >&5
+echo "$as_me:14880: result: $ac_cv_func__doprnt" >&5
 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
 if test $ac_cv_func__doprnt = yes; then
 
@@ -14947,7 +14890,7 @@ fi
 fi
 done
 
-  echo "$as_me:14950: checking for /proc/uptime" >&5
+  echo "$as_me:14893: checking for /proc/uptime" >&5
 echo $ECHO_N "checking for /proc/uptime... $ECHO_C" >&6
 if test "${jm_cv_have_proc_uptime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14958,7 +14901,7 @@ else
       && cat < /proc/uptime >/dev/null 2>/dev/null \
       && jm_cv_have_proc_uptime=yes
 fi
-echo "$as_me:14961: result: $jm_cv_have_proc_uptime" >&5
+echo "$as_me:14904: result: $jm_cv_have_proc_uptime" >&5
 echo "${ECHO_T}$jm_cv_have_proc_uptime" >&6
   if test $jm_cv_have_proc_uptime = yes; then
 
@@ -14971,13 +14914,13 @@ EOF
 for ac_func in ftruncate
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:14974: checking for $ac_func" >&5
+echo "$as_me:14917: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14980 "configure"
+#line 14923 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15008,16 +14951,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15014: \$? = $ac_status" >&5
+  echo "$as_me:14957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15020: \$? = $ac_status" >&5
+  echo "$as_me:14963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -15027,7 +14970,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15030: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:14973: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15044,23 +14987,23 @@ done
 for ac_header in unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:15047: checking for $ac_header" >&5
+echo "$as_me:14990: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15053 "configure"
+#line 14996 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15057: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15000: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15063: \$? = $ac_status" >&5
+  echo "$as_me:15006: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15079,7 +15022,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15082: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:15025: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15092,13 +15035,13 @@ done
 for ac_func in chsize
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:15095: checking for $ac_func" >&5
+echo "$as_me:15038: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15101 "configure"
+#line 15044 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15129,16 +15072,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15075: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15135: \$? = $ac_status" >&5
+  echo "$as_me:15078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15141: \$? = $ac_status" >&5
+  echo "$as_me:15084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -15148,7 +15091,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15151: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:15094: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15161,7 +15104,7 @@ done
     LIBOBJS="$LIBOBJS ftruncate.$ac_objext"
   fi
 
- echo "$as_me:15164: checking whether rename is broken" >&5
+ echo "$as_me:15107: checking whether rename is broken" >&5
 echo $ECHO_N "checking whether rename is broken... $ECHO_C" >&6
 if test "${vb_cv_func_rename_trailing_slash_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15169,14 +15112,14 @@ else
 
     rm -rf conftest.d1 conftest.d2
     mkdir conftest.d1 ||
-      { { echo "$as_me:15172: error: cannot create temporary directory" >&5
+      { { echo "$as_me:15115: error: cannot create temporary directory" >&5
 echo "$as_me: error: cannot create temporary directory" >&2;}
    { (exit 1); exit 1; }; }
     if test "$cross_compiling" = yes; then
         vb_cv_func_rename_trailing_slash_bug=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15179 "configure"
+#line 15122 "configure"
 #include "confdefs.h"
 
 #       include <stdio.h>
@@ -15188,15 +15131,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15194: \$? = $ac_status" >&5
+  echo "$as_me:15137: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15199: \$? = $ac_status" >&5
+  echo "$as_me:15142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   vb_cv_func_rename_trailing_slash_bug=no
 else
@@ -15205,13 +15148,13 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 vb_cv_func_rename_trailing_slash_bug=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
       rm -rf conftest.d1 conftest.d2
 
 fi
-echo "$as_me:15214: result: $vb_cv_func_rename_trailing_slash_bug" >&5
+echo "$as_me:15157: result: $vb_cv_func_rename_trailing_slash_bug" >&5
 echo "${ECHO_T}$vb_cv_func_rename_trailing_slash_bug" >&6
   if test $vb_cv_func_rename_trailing_slash_bug = yes; then
     LIBOBJS="$LIBOBJS rename.$ac_objext"
@@ -15222,7 +15165,7 @@ EOF
 
   fi
 
-echo "$as_me:15225: checking whether closedir returns void" >&5
+echo "$as_me:15168: checking whether closedir returns void" >&5
 echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6
 if test "${ac_cv_func_closedir_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15231,7 +15174,7 @@ else
   ac_cv_func_closedir_void=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15234 "configure"
+#line 15177 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_header_dirent>
@@ -15244,15 +15187,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15250: \$? = $ac_status" >&5
+  echo "$as_me:15193: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15255: \$? = $ac_status" >&5
+  echo "$as_me:15198: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_closedir_void=no
 else
@@ -15261,10 +15204,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_closedir_void=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:15267: result: $ac_cv_func_closedir_void" >&5
+echo "$as_me:15210: result: $ac_cv_func_closedir_void" >&5
 echo "${ECHO_T}$ac_cv_func_closedir_void" >&6
 if test $ac_cv_func_closedir_void = yes; then
 
@@ -15274,7 +15217,7 @@ EOF
 
 fi
 
-echo "$as_me:15277: checking whether utime accepts a null argument" >&5
+echo "$as_me:15220: checking whether utime accepts a null argument" >&5
 echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
 if test "${ac_cv_func_utime_null+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15285,7 +15228,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_utime_null=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15288 "configure"
+#line 15231 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -15301,15 +15244,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15307: \$? = $ac_status" >&5
+  echo "$as_me:15250: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15312: \$? = $ac_status" >&5
+  echo "$as_me:15255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_utime_null=yes
 else
@@ -15318,11 +15261,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_utime_null=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:15325: result: $ac_cv_func_utime_null" >&5
+echo "$as_me:15268: result: $ac_cv_func_utime_null" >&5
 echo "${ECHO_T}$ac_cv_func_utime_null" >&6
 if test $ac_cv_func_utime_null = yes; then
 
@@ -15336,23 +15279,23 @@ rm -f conftest.data
 for ac_header in utime.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:15339: checking for $ac_header" >&5
+echo "$as_me:15282: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15345 "configure"
+#line 15288 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15349: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15292: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15355: \$? = $ac_status" >&5
+  echo "$as_me:15298: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15371,7 +15314,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15374: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:15317: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15382,7 +15325,7 @@ fi
 done
 
   if test $ac_cv_func_utime_null = no; then
-    echo "$as_me:15385: checking whether utimes accepts a null argument" >&5
+    echo "$as_me:15328: checking whether utimes accepts a null argument" >&5
 echo $ECHO_N "checking whether utimes accepts a null argument... $ECHO_C" >&6
 if test "${ac_cv_func_utimes_null+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15392,7 +15335,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_utimes_null=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15395 "configure"
+#line 15338 "configure"
 #include "confdefs.h"
 
 /* In case stat has been defined to rpl_stat, undef it here.  */
@@ -15409,15 +15352,15 @@ exit(!(stat ("conftest.data", &s) == 0
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15415: \$? = $ac_status" >&5
+  echo "$as_me:15358: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15420: \$? = $ac_status" >&5
+  echo "$as_me:15363: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_utimes_null=yes
 else
@@ -15426,11 +15369,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_utimes_null=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:15433: result: $ac_cv_func_utimes_null" >&5
+echo "$as_me:15376: result: $ac_cv_func_utimes_null" >&5
 echo "${ECHO_T}$ac_cv_func_utimes_null" >&6
 
     if test $ac_cv_func_utimes_null = yes; then
@@ -15444,13 +15387,13 @@ EOF
 for ac_func in utime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:15447: checking for $ac_func" >&5
+echo "$as_me:15390: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15453 "configure"
+#line 15396 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15481,16 +15424,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15487: \$? = $ac_status" >&5
+  echo "$as_me:15430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15493: \$? = $ac_status" >&5
+  echo "$as_me:15436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -15500,7 +15443,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15503: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:15446: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15540,13 +15483,13 @@ EOF
   # be required by any autoconf macro that performs a compile-time test or
   # otherwise uses confdefs.h.
 
-  echo "$as_me:15543: checking for struct stat.st_blksize" >&5
+  echo "$as_me:15486: checking for struct stat.st_blksize" >&5
 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15549 "configure"
+#line 15492 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <sys/stat.h>
@@ -15561,16 +15504,16 @@ foo.st_blksize;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15567: \$? = $ac_status" >&5
+  echo "$as_me:15510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15573: \$? = $ac_status" >&5
+  echo "$as_me:15516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -15580,7 +15523,7 @@ ac_cv_member_struct_stat_st_blksize=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15583: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:15526: result: $ac_cv_member_struct_stat_st_blksize" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
 if test $ac_cv_member_struct_stat_st_blksize = yes; then
 
@@ -15590,13 +15533,13 @@ EOF
 
 fi
 
-  echo "$as_me:15593: checking for ino_t" >&5
+  echo "$as_me:15536: checking for ino_t" >&5
 echo $ECHO_N "checking for ino_t... $ECHO_C" >&6
 if test "${ac_cv_type_ino_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15599 "configure"
+#line 15542 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15611,16 +15554,16 @@ if (sizeof (ino_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15617: \$? = $ac_status" >&5
+  echo "$as_me:15560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15623: \$? = $ac_status" >&5
+  echo "$as_me:15566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ino_t=yes
 else
@@ -15630,7 +15573,7 @@ ac_cv_type_ino_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15633: result: $ac_cv_type_ino_t" >&5
+echo "$as_me:15576: result: $ac_cv_type_ino_t" >&5
 echo "${ECHO_T}$ac_cv_type_ino_t" >&6
 if test $ac_cv_type_ino_t = yes; then
   :
@@ -15642,13 +15585,13 @@ EOF
 
 fi
 
-      echo "$as_me:15645: checking for ssize_t" >&5
+      echo "$as_me:15588: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15651 "configure"
+#line 15594 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15663,16 +15606,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15669: \$? = $ac_status" >&5
+  echo "$as_me:15612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15675: \$? = $ac_status" >&5
+  echo "$as_me:15618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -15682,7 +15625,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15685: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:15628: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   :
@@ -15702,7 +15645,7 @@ fi
     # If cross compiling, assume the test would fail and use the included
     # regex.c.  The first failing regular expression is from `Spencer ere
     # test #75' in grep-2.3.
-    echo "$as_me:15705: checking for working re_compile_pattern" >&5
+    echo "$as_me:15648: checking for working re_compile_pattern" >&5
 echo $ECHO_N "checking for working re_compile_pattern... $ECHO_C" >&6
 if test "${jm_cv_func_working_re_compile_pattern+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15711,7 +15654,7 @@ else
   	       jm_cv_func_working_re_compile_pattern=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15714 "configure"
+#line 15657 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <regex.h>
@@ -15750,15 +15693,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15756: \$? = $ac_status" >&5
+  echo "$as_me:15699: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15761: \$? = $ac_status" >&5
+  echo "$as_me:15704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_working_re_compile_pattern=yes
 else
@@ -15767,16 +15710,16 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_working_re_compile_pattern=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:15773: result: $jm_cv_func_working_re_compile_pattern" >&5
+echo "$as_me:15716: result: $jm_cv_func_working_re_compile_pattern" >&5
 echo "${ECHO_T}$jm_cv_func_working_re_compile_pattern" >&6
     if test $jm_cv_func_working_re_compile_pattern = yes; then
       ac_use_included_regex=no
     fi
 
-    test -n "lib/regex.c" || { { echo "$as_me:15779: error: missing argument" >&5
+    test -n "lib/regex.c" || { { echo "$as_me:15722: error: missing argument" >&5
 echo "$as_me: error: missing argument" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -15801,7 +15744,7 @@ ac_lib_dir_getloadavg=$srcdir
 ac_lib_dir_getloadavg=$srcdir/lib
 # Make sure getloadavg.c is where it belongs, at ./configure-time.
 test -f $ac_lib_dir_getloadavg/getloadavg.c \
-  || { { echo "$as_me:15804: error: getloadavg.c is not in $ac_lib_dir_getloadavg" >&5
+  || { { echo "$as_me:15747: error: getloadavg.c is not in $ac_lib_dir_getloadavg" >&5
 echo "$as_me: error: getloadavg.c is not in $ac_lib_dir_getloadavg" >&2;}
    { (exit 1); exit 1; }; }
 # FIXME: Add an autoconf-time test, too?
@@ -15809,13 +15752,13 @@ echo "$as_me: error: getloadavg.c is not
 ac_save_LIBS=$LIBS
 
 # Check for getloadavg, but be sure not to touch the cache variable.
-(echo "$as_me:15812: checking for getloadavg" >&5
+(echo "$as_me:15755: checking for getloadavg" >&5
 echo $ECHO_N "checking for getloadavg... $ECHO_C" >&6
 if test "${ac_cv_func_getloadavg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15818 "configure"
+#line 15761 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getloadavg (); below.  */
@@ -15846,16 +15789,16 @@ f = getloadavg;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15852: \$? = $ac_status" >&5
+  echo "$as_me:15795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15858: \$? = $ac_status" >&5
+  echo "$as_me:15801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getloadavg=yes
 else
@@ -15865,7 +15808,7 @@ ac_cv_func_getloadavg=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15868: result: $ac_cv_func_getloadavg" >&5
+echo "$as_me:15811: result: $ac_cv_func_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_func_getloadavg" >&6
 if test $ac_cv_func_getloadavg = yes; then
   exit 0
@@ -15879,13 +15822,13 @@ fi
 for ac_func in pstat_getdynamic
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:15882: checking for $ac_func" >&5
+echo "$as_me:15825: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15888 "configure"
+#line 15831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15916,16 +15859,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15922: \$? = $ac_status" >&5
+  echo "$as_me:15865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15928: \$? = $ac_status" >&5
+  echo "$as_me:15871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -15935,7 +15878,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15938: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:15881: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15947,7 +15890,7 @@ done
 
 # Solaris has libkstat which does not require root.
 
-echo "$as_me:15950: checking for kstat_open in -lkstat" >&5
+echo "$as_me:15893: checking for kstat_open in -lkstat" >&5
 echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6
 if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15955,7 +15898,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkstat  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15958 "configure"
+#line 15901 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15974,16 +15917,16 @@ kstat_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15980: \$? = $ac_status" >&5
+  echo "$as_me:15923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15986: \$? = $ac_status" >&5
+  echo "$as_me:15929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kstat_kstat_open=yes
 else
@@ -15994,7 +15937,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15997: result: $ac_cv_lib_kstat_kstat_open" >&5
+echo "$as_me:15940: result: $ac_cv_lib_kstat_kstat_open" >&5
 echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6
 if test $ac_cv_lib_kstat_kstat_open = yes; then
   cat >>confdefs.h <<EOF
@@ -16012,7 +15955,7 @@ test $ac_cv_lib_kstat_kstat_open = yes &
 # to get the right answer into the cache.
 # For kstat on solaris, we need libelf to force the definition of SVR4 below.
 if test $ac_have_func = no; then
-  echo "$as_me:16015: checking for elf_begin in -lelf" >&5
+  echo "$as_me:15958: checking for elf_begin in -lelf" >&5
 echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6
 if test "${ac_cv_lib_elf_elf_begin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16020,7 +15963,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16023 "configure"
+#line 15966 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16039,16 +15982,16 @@ elf_begin ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16045: \$? = $ac_status" >&5
+  echo "$as_me:15988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16051: \$? = $ac_status" >&5
+  echo "$as_me:15994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -16059,7 +16002,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16062: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:16005: result: $ac_cv_lib_elf_elf_begin" >&5
 echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6
 if test $ac_cv_lib_elf_elf_begin = yes; then
   LIBS="-lelf $LIBS"
@@ -16067,7 +16010,7 @@ fi
 
 fi
 if test $ac_have_func = no; then
-  echo "$as_me:16070: checking for kvm_open in -lkvm" >&5
+  echo "$as_me:16013: checking for kvm_open in -lkvm" >&5
 echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6
 if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16075,7 +16018,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16078 "configure"
+#line 16021 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16094,16 +16037,16 @@ kvm_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16100: \$? = $ac_status" >&5
+  echo "$as_me:16043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16106: \$? = $ac_status" >&5
+  echo "$as_me:16049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kvm_kvm_open=yes
 else
@@ -16114,14 +16057,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16117: result: $ac_cv_lib_kvm_kvm_open" >&5
+echo "$as_me:16060: result: $ac_cv_lib_kvm_kvm_open" >&5
 echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6
 if test $ac_cv_lib_kvm_kvm_open = yes; then
   LIBS="-lkvm $LIBS"
 fi
 
   # Check for the 4.4BSD definition of getloadavg.
-  echo "$as_me:16124: checking for getloadavg in -lutil" >&5
+  echo "$as_me:16067: checking for getloadavg in -lutil" >&5
 echo $ECHO_N "checking for getloadavg in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_getloadavg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16129,7 +16072,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16132 "configure"
+#line 16075 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16148,16 +16091,16 @@ getloadavg ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16154: \$? = $ac_status" >&5
+  echo "$as_me:16097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16160: \$? = $ac_status" >&5
+  echo "$as_me:16103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_getloadavg=yes
 else
@@ -16168,7 +16111,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16171: result: $ac_cv_lib_util_getloadavg" >&5
+echo "$as_me:16114: result: $ac_cv_lib_util_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_lib_util_getloadavg" >&6
 if test $ac_cv_lib_util_getloadavg = yes; then
   LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
@@ -16181,7 +16124,7 @@ if test $ac_have_func = no; then
   # Since it is not a standard part of AIX, it might be installed locally.
   ac_getloadavg_LIBS=$LIBS
   LIBS="-L/usr/local/lib $LIBS"
-  echo "$as_me:16184: checking for getloadavg in -lgetloadavg" >&5
+  echo "$as_me:16127: checking for getloadavg in -lgetloadavg" >&5
 echo $ECHO_N "checking for getloadavg in -lgetloadavg... $ECHO_C" >&6
 if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16189,7 +16132,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgetloadavg  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16192 "configure"
+#line 16135 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16208,16 +16151,16 @@ getloadavg ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16214: \$? = $ac_status" >&5
+  echo "$as_me:16157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16220: \$? = $ac_status" >&5
+  echo "$as_me:16163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_getloadavg_getloadavg=yes
 else
@@ -16228,7 +16171,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16231: result: $ac_cv_lib_getloadavg_getloadavg" >&5
+echo "$as_me:16174: result: $ac_cv_lib_getloadavg_getloadavg" >&5
 echo "${ECHO_T}$ac_cv_lib_getloadavg_getloadavg" >&6
 if test $ac_cv_lib_getloadavg_getloadavg = yes; then
   LIBS="-lgetloadavg $LIBS"
@@ -16244,13 +16187,13 @@ fi
 for ac_func in getloadavg
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:16247: checking for $ac_func" >&5
+echo "$as_me:16190: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16253 "configure"
+#line 16196 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16281,16 +16224,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16287: \$? = $ac_status" >&5
+  echo "$as_me:16230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16293: \$? = $ac_status" >&5
+  echo "$as_me:16236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -16300,7 +16243,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16303: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:16246: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16316,23 +16259,23 @@ EOF
 
 # Figure out what our getloadavg.c needs.
 ac_have_func=no
-echo "$as_me:16319: checking for sys/dg_sys_info.h" >&5
+echo "$as_me:16262: checking for sys/dg_sys_info.h" >&5
 echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16325 "configure"
+#line 16268 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
 _ACEOF
-if { (eval echo "$as_me:16329: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16272: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16335: \$? = $ac_status" >&5
+  echo "$as_me:16278: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16351,7 +16294,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16354: result: $ac_cv_header_sys_dg_sys_info_h" >&5
+echo "$as_me:16297: result: $ac_cv_header_sys_dg_sys_info_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6
 if test $ac_cv_header_sys_dg_sys_info_h = yes; then
   ac_have_func=yes
@@ -16360,7 +16303,7 @@ cat >>confdefs.h <<\EOF
 #define DGUX 1
 EOF
 
-echo "$as_me:16363: checking for dg_sys_info in -ldgc" >&5
+echo "$as_me:16306: checking for dg_sys_info in -ldgc" >&5
 echo $ECHO_N "checking for dg_sys_info in -ldgc... $ECHO_C" >&6
 if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16368,7 +16311,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldgc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16371 "configure"
+#line 16314 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16387,16 +16330,16 @@ dg_sys_info ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16393: \$? = $ac_status" >&5
+  echo "$as_me:16336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16399: \$? = $ac_status" >&5
+  echo "$as_me:16342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dgc_dg_sys_info=yes
 else
@@ -16407,7 +16350,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16410: result: $ac_cv_lib_dgc_dg_sys_info" >&5
+echo "$as_me:16353: result: $ac_cv_lib_dgc_dg_sys_info" >&5
 echo "${ECHO_T}$ac_cv_lib_dgc_dg_sys_info" >&6
 if test $ac_cv_lib_dgc_dg_sys_info = yes; then
   cat >>confdefs.h <<EOF
@@ -16420,23 +16363,23 @@ fi
 
 fi
 
-echo "$as_me:16423: checking for locale.h" >&5
+echo "$as_me:16366: checking for locale.h" >&5
 echo $ECHO_N "checking for locale.h... $ECHO_C" >&6
 if test "${ac_cv_header_locale_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16429 "configure"
+#line 16372 "configure"
 #include "confdefs.h"
 #include <locale.h>
 _ACEOF
-if { (eval echo "$as_me:16433: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16376: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16439: \$? = $ac_status" >&5
+  echo "$as_me:16382: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16455,19 +16398,19 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16458: result: $ac_cv_header_locale_h" >&5
+echo "$as_me:16401: result: $ac_cv_header_locale_h" >&5
 echo "${ECHO_T}$ac_cv_header_locale_h" >&6
 
 for ac_func in setlocale
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:16464: checking for $ac_func" >&5
+echo "$as_me:16407: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16470 "configure"
+#line 16413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16498,16 +16441,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16504: \$? = $ac_status" >&5
+  echo "$as_me:16447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16510: \$? = $ac_status" >&5
+  echo "$as_me:16453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -16517,7 +16460,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16520: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:16463: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16540,23 +16483,23 @@ EOF
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:16543: checking for inq_stats/cpustats.h" >&5
+  echo "$as_me:16486: checking for inq_stats/cpustats.h" >&5
 echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6
 if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16549 "configure"
+#line 16492 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:16553: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16496: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16559: \$? = $ac_status" >&5
+  echo "$as_me:16502: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16575,7 +16518,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16578: result: $ac_cv_header_inq_stats_cpustats_h" >&5
+echo "$as_me:16521: result: $ac_cv_header_inq_stats_cpustats_h" >&5
 echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6
 if test $ac_cv_header_inq_stats_cpustats_h = yes; then
   ac_have_func=yes
@@ -16593,23 +16536,23 @@ fi
 fi
 
 if test $ac_have_func = no; then
-  echo "$as_me:16596: checking for sys/cpustats.h" >&5
+  echo "$as_me:16539: checking for sys/cpustats.h" >&5
 echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_cpustats_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16602 "configure"
+#line 16545 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
 _ACEOF
-if { (eval echo "$as_me:16606: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16549: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16612: \$? = $ac_status" >&5
+  echo "$as_me:16555: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16628,7 +16571,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16631: result: $ac_cv_header_sys_cpustats_h" >&5
+echo "$as_me:16574: result: $ac_cv_header_sys_cpustats_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6
 if test $ac_cv_header_sys_cpustats_h = yes; then
   ac_have_func=yes; cat >>confdefs.h <<\EOF
@@ -16644,23 +16587,23 @@ if test $ac_have_func = no; then
 for ac_header in mach/mach.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:16647: checking for $ac_header" >&5
+echo "$as_me:16590: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16653 "configure"
+#line 16596 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16657: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16600: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16663: \$? = $ac_status" >&5
+  echo "$as_me:16606: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16679,7 +16622,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16682: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:16625: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16694,23 +16637,23 @@ fi
 for ac_header in nlist.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:16697: checking for $ac_header" >&5
+echo "$as_me:16640: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16703 "configure"
+#line 16646 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16707: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16650: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16713: \$? = $ac_status" >&5
+  echo "$as_me:16656: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16729,19 +16672,19 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16732: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:16675: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
 EOF
- echo "$as_me:16738: checking for struct nlist.n_un.n_name" >&5
+ echo "$as_me:16681: checking for struct nlist.n_un.n_name" >&5
 echo $ECHO_N "checking for struct nlist.n_un.n_name... $ECHO_C" >&6
 if test "${ac_cv_member_struct_nlist_n_un_n_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16744 "configure"
+#line 16687 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 
@@ -16755,16 +16698,16 @@ foo.n_un.n_name;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16701: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16761: \$? = $ac_status" >&5
+  echo "$as_me:16704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16767: \$? = $ac_status" >&5
+  echo "$as_me:16710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_nlist_n_un_n_name=yes
 else
@@ -16774,7 +16717,7 @@ ac_cv_member_struct_nlist_n_un_n_name=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:16777: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
+echo "$as_me:16720: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
 echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6
 if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then
 
@@ -16795,13 +16738,13 @@ fi
 done
 
 # Some definitions of getloadavg require that the program be installed setgid.
-echo "$as_me:16798: checking whether getloadavg requires setgid" >&5
+echo "$as_me:16741: checking whether getloadavg requires setgid" >&5
 echo $ECHO_N "checking whether getloadavg requires setgid... $ECHO_C" >&6
 if test "${ac_cv_func_getloadavg_setgid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16804 "configure"
+#line 16747 "configure"
 #include "confdefs.h"
 #include "$ac_lib_dir_getloadavg/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
@@ -16817,7 +16760,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:16820: result: $ac_cv_func_getloadavg_setgid" >&5
+echo "$as_me:16763: result: $ac_cv_func_getloadavg_setgid" >&5
 echo "${ECHO_T}$ac_cv_func_getloadavg_setgid" >&6
 if test $ac_cv_func_getloadavg_setgid = yes; then
   NEED_SETGID=true
@@ -16831,7 +16774,7 @@ else
 fi
 
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  echo "$as_me:16834: checking group of /dev/kmem" >&5
+  echo "$as_me:16777: checking group of /dev/kmem" >&5
 echo $ECHO_N "checking group of /dev/kmem... $ECHO_C" >&6
 if test "${ac_cv_group_kmem+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16846,7 +16789,7 @@ else
 	       / /s/.* //;p;'`
 
 fi
-echo "$as_me:16849: result: $ac_cv_group_kmem" >&5
+echo "$as_me:16792: result: $ac_cv_group_kmem" >&5
 echo "${ECHO_T}$ac_cv_group_kmem" >&6
   KMEM_GROUP=$ac_cv_group_kmem
 fi
@@ -16860,13 +16803,13 @@ LIBS=$ac_save_LIBS
 for ac_func in strcasecmp strncasecmp
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:16863: checking for $ac_func" >&5
+echo "$as_me:16806: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16869 "configure"
+#line 16812 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16897,16 +16840,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16903: \$? = $ac_status" >&5
+  echo "$as_me:16846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16909: \$? = $ac_status" >&5
+  echo "$as_me:16852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -16916,7 +16859,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16919: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:16862: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16931,13 +16874,13 @@ done
 for ac_func in dup2
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:16934: checking for $ac_func" >&5
+echo "$as_me:16877: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16940 "configure"
+#line 16883 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16968,16 +16911,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16974: \$? = $ac_status" >&5
+  echo "$as_me:16917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16980: \$? = $ac_status" >&5
+  echo "$as_me:16923: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -16987,7 +16930,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16990: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:16933: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17002,13 +16945,13 @@ done
 for ac_func in gethostname getusershell
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17005: checking for $ac_func" >&5
+echo "$as_me:16948: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17011 "configure"
+#line 16954 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17039,16 +16982,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17045: \$? = $ac_status" >&5
+  echo "$as_me:16988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17051: \$? = $ac_status" >&5
+  echo "$as_me:16994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17058,7 +17001,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17061: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17004: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17073,13 +17016,13 @@ done
 for ac_func in stime strcspn stpcpy strstr strtol strtoul
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17076: checking for $ac_func" >&5
+echo "$as_me:17019: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17082 "configure"
+#line 17025 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17110,16 +17053,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17116: \$? = $ac_status" >&5
+  echo "$as_me:17059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17122: \$? = $ac_status" >&5
+  echo "$as_me:17065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17129,7 +17072,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17132: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17075: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17144,13 +17087,13 @@ done
 for ac_func in strpbrk
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17147: checking for $ac_func" >&5
+echo "$as_me:17090: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17153 "configure"
+#line 17096 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17181,16 +17124,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17187: \$? = $ac_status" >&5
+  echo "$as_me:17130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17193: \$? = $ac_status" >&5
+  echo "$as_me:17136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17200,7 +17143,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17203: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17146: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17215,13 +17158,13 @@ done
 for ac_func in euidaccess memcmp rmdir rpmatch strndup strverscmp
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17218: checking for $ac_func" >&5
+echo "$as_me:17161: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17224 "configure"
+#line 17167 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17252,16 +17195,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17258: \$? = $ac_status" >&5
+  echo "$as_me:17201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17264: \$? = $ac_status" >&5
+  echo "$as_me:17207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17271,7 +17214,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17274: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17217: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17286,13 +17229,13 @@ done
 for ac_func in atexit
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17289: checking for $ac_func" >&5
+echo "$as_me:17232: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17295 "configure"
+#line 17238 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17323,16 +17266,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17329: \$? = $ac_status" >&5
+  echo "$as_me:17272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17335: \$? = $ac_status" >&5
+  echo "$as_me:17278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17342,7 +17285,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17345: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17288: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17357,13 +17300,13 @@ done
 for ac_func in strnlen
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17360: checking for $ac_func" >&5
+echo "$as_me:17303: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17366 "configure"
+#line 17309 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17394,16 +17337,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17400: \$? = $ac_status" >&5
+  echo "$as_me:17343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17406: \$? = $ac_status" >&5
+  echo "$as_me:17349: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17413,7 +17356,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17416: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17359: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17428,13 +17371,13 @@ done
 for ac_func in getpass
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17431: checking for $ac_func" >&5
+echo "$as_me:17374: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17437 "configure"
+#line 17380 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17465,16 +17408,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17471: \$? = $ac_status" >&5
+  echo "$as_me:17414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17477: \$? = $ac_status" >&5
+  echo "$as_me:17420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17484,7 +17427,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17487: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17430: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17499,13 +17442,13 @@ done
 for ac_func in strdup
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17502: checking for $ac_func" >&5
+echo "$as_me:17445: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17508 "configure"
+#line 17451 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17536,16 +17479,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17542: \$? = $ac_status" >&5
+  echo "$as_me:17485: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17548: \$? = $ac_status" >&5
+  echo "$as_me:17491: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17555,7 +17498,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17558: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17501: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17570,13 +17513,13 @@ done
 for ac_func in memchr memcpy memmove memrchr memset
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17573: checking for $ac_func" >&5
+echo "$as_me:17516: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17579 "configure"
+#line 17522 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17607,16 +17550,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17613: \$? = $ac_status" >&5
+  echo "$as_me:17556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17619: \$? = $ac_status" >&5
+  echo "$as_me:17562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17626,7 +17569,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17629: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17572: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17641,13 +17584,13 @@ done
 for ac_func in getpagesize
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17644: checking for $ac_func" >&5
+echo "$as_me:17587: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17650 "configure"
+#line 17593 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17678,16 +17621,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17684: \$? = $ac_status" >&5
+  echo "$as_me:17627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17690: \$? = $ac_status" >&5
+  echo "$as_me:17633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17697,7 +17640,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17700: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17643: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17710,13 +17653,13 @@ done
 for ac_func in mkstemp
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17713: checking for $ac_func" >&5
+echo "$as_me:17656: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17719 "configure"
+#line 17662 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17747,16 +17690,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17693: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17753: \$? = $ac_status" >&5
+  echo "$as_me:17696: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17759: \$? = $ac_status" >&5
+  echo "$as_me:17702: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -17766,7 +17709,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17769: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17712: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -17792,18 +17735,18 @@ cat >>confdefs.h <<\EOF
 #define ARGMATCH_DIE_DECL extern void usage ()
 EOF
 
-        echo "$as_me:17795: checking whether setvbuf arguments are reversed" >&5
+        echo "$as_me:17738: checking whether setvbuf arguments are reversed" >&5
 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17801: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17744: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17806 "configure"
+#line 17749 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -17820,15 +17763,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17826: \$? = $ac_status" >&5
+  echo "$as_me:17769: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17831: \$? = $ac_status" >&5
+  echo "$as_me:17774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -17837,11 +17780,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_setvbuf_reversed=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:17844: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:17787: result: $ac_cv_func_setvbuf_reversed" >&5
 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
 if test $ac_cv_func_setvbuf_reversed = yes; then
 
@@ -17860,7 +17803,7 @@ fi
   # library, inducing unnecessary run-time overhead.
   fetish_saved_libs=$LIBS
 
-  echo "$as_me:17863: checking for library containing clock_gettime" >&5
+  echo "$as_me:17806: checking for library containing clock_gettime" >&5
 echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_search_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17869,7 +17812,7 @@ else
     ac_func_search_save_LIBS=$LIBS
     ac_cv_search_clock_gettime=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 17872 "configure"
+#line 17815 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17888,16 +17831,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17894: \$? = $ac_status" >&5
+  echo "$as_me:17837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17900: \$? = $ac_status" >&5
+  echo "$as_me:17843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_clock_gettime='none required'
 else
@@ -17909,7 +17852,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       for ac_lib in rt posix4; do
 	LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17912 "configure"
+#line 17855 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17928,16 +17871,16 @@ clock_gettime ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17934: \$? = $ac_status" >&5
+  echo "$as_me:17877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17940: \$? = $ac_status" >&5
+  echo "$as_me:17883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_clock_gettime="-l$ac_lib"; break
 else
@@ -17950,7 +17893,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     LIBS=$ac_func_search_save_LIBS
 
 fi
-echo "$as_me:17953: result: $ac_cv_search_clock_gettime" >&5
+echo "$as_me:17896: result: $ac_cv_search_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6
 
   if test "$ac_cv_search_clock_gettime" = no; then :
@@ -17967,13 +17910,13 @@ echo "${ECHO_T}$ac_cv_search_clock_getti
 for ac_func in clock_gettime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17970: checking for $ac_func" >&5
+echo "$as_me:17913: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17976 "configure"
+#line 17919 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18004,16 +17947,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18010: \$? = $ac_status" >&5
+  echo "$as_me:17953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18016: \$? = $ac_status" >&5
+  echo "$as_me:17959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -18023,7 +17966,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18026: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:17969: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18038,13 +17981,13 @@ done
 for ac_func in gettimeofday
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18041: checking for $ac_func" >&5
+echo "$as_me:17984: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18047 "configure"
+#line 17990 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18075,16 +18018,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18081: \$? = $ac_status" >&5
+  echo "$as_me:18024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18087: \$? = $ac_status" >&5
+  echo "$as_me:18030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -18094,7 +18037,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18097: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:18040: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18137,13 +18080,13 @@ for ac_func in \
 
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18140: checking for $ac_func" >&5
+echo "$as_me:18083: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18146 "configure"
+#line 18089 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18174,16 +18117,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18180: \$? = $ac_status" >&5
+  echo "$as_me:18123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18186: \$? = $ac_status" >&5
+  echo "$as_me:18129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -18193,7 +18136,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18196: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:18139: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18204,13 +18147,13 @@ fi
 done
 
     am_getline_needs_run_time_check=no
-  echo "$as_me:18207: checking for getline" >&5
+  echo "$as_me:18150: checking for getline" >&5
 echo $ECHO_N "checking for getline... $ECHO_C" >&6
 if test "${ac_cv_func_getline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18213 "configure"
+#line 18156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getline (); below.  */
@@ -18241,16 +18184,16 @@ f = getline;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18247: \$? = $ac_status" >&5
+  echo "$as_me:18190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18253: \$? = $ac_status" >&5
+  echo "$as_me:18196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getline=yes
 else
@@ -18260,7 +18203,7 @@ ac_cv_func_getline=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18263: result: $ac_cv_func_getline" >&5
+echo "$as_me:18206: result: $ac_cv_func_getline" >&5
 echo "${ECHO_T}$ac_cv_func_getline" >&6
 if test $ac_cv_func_getline = yes; then
   		am_getline_needs_run_time_check=yes
@@ -18273,23 +18216,23 @@ fi
 for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:18276: checking for $ac_header" >&5
+echo "$as_me:18219: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18282 "configure"
+#line 18225 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18286: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18229: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18292: \$? = $ac_status" >&5
+  echo "$as_me:18235: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18308,7 +18251,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18311: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:18254: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18318,7 +18261,7 @@ EOF
 fi
 done
 
-    echo "$as_me:18321: checking for working getline function" >&5
+    echo "$as_me:18264: checking for working getline function" >&5
 echo $ECHO_N "checking for working getline function... $ECHO_C" >&6
 if test "${am_cv_func_working_getline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18328,7 +18271,7 @@ else
   am_cv_func_working_getline=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18331 "configure"
+#line 18274 "configure"
 #include "confdefs.h"
 
 #    include <stdio.h>
@@ -18350,15 +18293,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18356: \$? = $ac_status" >&5
+  echo "$as_me:18299: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18361: \$? = $ac_status" >&5
+  echo "$as_me:18304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_working_getline=yes
 else
@@ -18367,10 +18310,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 am_cv_func_working_getline=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:18373: result: $am_cv_func_working_getline" >&5
+echo "$as_me:18316: result: $am_cv_func_working_getline" >&5
 echo "${ECHO_T}$am_cv_func_working_getline" >&6
   fi
 
@@ -18383,13 +18326,13 @@ echo "${ECHO_T}$am_cv_func_working_getli
 for ac_func in getdelim
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18386: checking for $ac_func" >&5
+echo "$as_me:18329: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18392 "configure"
+#line 18335 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18420,16 +18363,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18426: \$? = $ac_status" >&5
+  echo "$as_me:18369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18432: \$? = $ac_status" >&5
+  echo "$as_me:18375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -18439,7 +18382,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18442: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:18385: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18450,13 +18393,13 @@ fi
 done
 
   fi
-  echo "$as_me:18453: checking for obstacks" >&5
+  echo "$as_me:18396: checking for obstacks" >&5
 echo $ECHO_N "checking for obstacks... $ECHO_C" >&6
 if test "${am_cv_func_obstack+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18459 "configure"
+#line 18402 "configure"
 #include "confdefs.h"
 #include "obstack.h"
 int
@@ -18468,16 +18411,16 @@ struct obstack *mem;obstack_free(mem,(ch
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18474: \$? = $ac_status" >&5
+  echo "$as_me:18417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18480: \$? = $ac_status" >&5
+  echo "$as_me:18423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_obstack=yes
 else
@@ -18487,7 +18430,7 @@ am_cv_func_obstack=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18490: result: $am_cv_func_obstack" >&5
+echo "$as_me:18433: result: $am_cv_func_obstack" >&5
 echo "${ECHO_T}$am_cv_func_obstack" >&6
  if test $am_cv_func_obstack = yes; then
 
@@ -18499,7 +18442,7 @@ EOF
    LIBOBJS="$LIBOBJS obstack.$ac_objext"
  fi
 
-  echo "$as_me:18502: checking for working strtod" >&5
+  echo "$as_me:18445: checking for working strtod" >&5
 echo $ECHO_N "checking for working strtod... $ECHO_C" >&6
 if test "${am_cv_func_strtod+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18508,7 +18451,7 @@ else
   am_cv_func_strtod=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18511 "configure"
+#line 18454 "configure"
 #include "confdefs.h"
 
 double strtod ();
@@ -18539,15 +18482,15 @@ main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18545: \$? = $ac_status" >&5
+  echo "$as_me:18488: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18550: \$? = $ac_status" >&5
+  echo "$as_me:18493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_func_strtod=yes
 else
@@ -18556,10 +18499,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 am_cv_func_strtod=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:18562: result: $am_cv_func_strtod" >&5
+echo "$as_me:18505: result: $am_cv_func_strtod" >&5
 echo "${ECHO_T}$am_cv_func_strtod" >&6
 test $am_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.$ac_objext"
 am_cv_func_strtod_needs_libm=no
@@ -18568,13 +18511,13 @@ if test $am_cv_func_strtod = no; then
 for ac_func in pow
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18571: checking for $ac_func" >&5
+echo "$as_me:18514: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18577 "configure"
+#line 18520 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18605,16 +18548,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18611: \$? = $ac_status" >&5
+  echo "$as_me:18554: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18617: \$? = $ac_status" >&5
+  echo "$as_me:18560: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -18624,7 +18567,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18627: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:18570: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18635,7 +18578,7 @@ fi
 done
 
   if test $ac_cv_func_pow = no; then
-    echo "$as_me:18638: checking for pow in -lm" >&5
+    echo "$as_me:18581: checking for pow in -lm" >&5
 echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_pow+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18643,7 +18586,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18646 "configure"
+#line 18589 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18662,16 +18605,16 @@ pow ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18668: \$? = $ac_status" >&5
+  echo "$as_me:18611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18674: \$? = $ac_status" >&5
+  echo "$as_me:18617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_pow=yes
 else
@@ -18682,12 +18625,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18685: result: $ac_cv_lib_m_pow" >&5
+echo "$as_me:18628: result: $ac_cv_lib_m_pow" >&5
 echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
 if test $ac_cv_lib_m_pow = yes; then
   am_cv_func_strtod_needs_libm=yes
 else
-  { echo "$as_me:18690: WARNING: can't find library containing definition of pow" >&5
+  { echo "$as_me:18633: WARNING: can't find library containing definition of pow" >&5
 echo "$as_me: WARNING: can't find library containing definition of pow" >&2;}
 fi
 
@@ -18707,7 +18650,7 @@ fi
      x = rint (x);
      x = modf (x, &y);'
   cat >conftest.$ac_ext <<_ACEOF
-#line 18710 "configure"
+#line 18653 "configure"
 #include "confdefs.h"
 #include <math.h>
 int
@@ -18719,16 +18662,16 @@ $ac_seq_body
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18725: \$? = $ac_status" >&5
+  echo "$as_me:18668: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18731: \$? = $ac_status" >&5
+  echo "$as_me:18674: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18737,7 +18680,7 @@ cat conftest.$ac_ext >&5
 ac_seq_save_LIBS="$LIBS"
      LIBS="$LIBS -lm"
      cat >conftest.$ac_ext <<_ACEOF
-#line 18740 "configure"
+#line 18683 "configure"
 #include "confdefs.h"
 #include <math.h>
 int
@@ -18749,16 +18692,16 @@ $ac_seq_body
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18755: \$? = $ac_status" >&5
+  echo "$as_me:18698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18761: \$? = $ac_status" >&5
+  echo "$as_me:18704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   SEQ_LIBM=-lm
 else
@@ -18774,23 +18717,23 @@ rm -f conftest.$ac_objext conftest$ac_ex
 for ac_header in langinfo.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:18777: checking for $ac_header" >&5
+echo "$as_me:18720: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18783 "configure"
+#line 18726 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18787: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18730: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18793: \$? = $ac_status" >&5
+  echo "$as_me:18736: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18809,7 +18752,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18812: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:18755: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18822,13 +18765,13 @@ done
 for ac_func in nl_langinfo
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18825: checking for $ac_func" >&5
+echo "$as_me:18768: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18831 "configure"
+#line 18774 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18859,16 +18802,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18865: \$? = $ac_status" >&5
+  echo "$as_me:18808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18871: \$? = $ac_status" >&5
+  echo "$as_me:18814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -18878,7 +18821,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18881: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:18824: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -18888,13 +18831,13 @@ EOF
 fi
 done
 
-  echo "$as_me:18891: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:18834: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${jm_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18897 "configure"
+#line 18840 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -18906,16 +18849,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18912: \$? = $ac_status" >&5
+  echo "$as_me:18855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18918: \$? = $ac_status" >&5
+  echo "$as_me:18861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_langinfo_codeset=yes
 else
@@ -18926,7 +18869,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:18929: result: $jm_cv_langinfo_codeset" >&5
+echo "$as_me:18872: result: $jm_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$jm_cv_langinfo_codeset" >&6
   if test $jm_cv_langinfo_codeset = yes; then
 
@@ -18936,13 +18879,13 @@ EOF
 
   fi
 
-    echo "$as_me:18939: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:18882: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18945 "configure"
+#line 18888 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -18962,12 +18905,12 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:18965: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:18908: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
 
-      echo "$as_me:18970: checking for iconv" >&5
+      echo "$as_me:18913: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${jm_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18976,7 +18919,7 @@ else
     jm_cv_func_iconv="no, consider installing GNU libiconv"
     jm_cv_lib_iconv=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 18979 "configure"
+#line 18922 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -18991,16 +18934,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18997: \$? = $ac_status" >&5
+  echo "$as_me:18940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19003: \$? = $ac_status" >&5
+  echo "$as_me:18946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_iconv=yes
 else
@@ -19012,7 +18955,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       jm_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat >conftest.$ac_ext <<_ACEOF
-#line 19015 "configure"
+#line 18958 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -19027,16 +18970,16 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19033: \$? = $ac_status" >&5
+  echo "$as_me:18976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19039: \$? = $ac_status" >&5
+  echo "$as_me:18982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_lib_iconv=yes
         jm_cv_func_iconv=yes
@@ -19049,7 +18992,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     fi
 
 fi
-echo "$as_me:19052: result: $jm_cv_func_iconv" >&5
+echo "$as_me:18995: result: $jm_cv_func_iconv" >&5
 echo "${ECHO_T}$jm_cv_func_iconv" >&6
   if test "$jm_cv_func_iconv" = yes; then
 
@@ -19057,14 +19000,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:19060: checking for iconv declaration" >&5
+    echo "$as_me:19003: checking for iconv declaration" >&5
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${jm_cv_proto_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 19067 "configure"
+#line 19010 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -19088,16 +19031,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19094: \$? = $ac_status" >&5
+  echo "$as_me:19037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19100: \$? = $ac_status" >&5
+  echo "$as_me:19043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_proto_iconv_arg1=""
 else
@@ -19110,7 +19053,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
 fi
 
     jm_cv_proto_iconv=`echo "$jm_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:19113: result: ${ac_t:-
+    echo "$as_me:19056: result: ${ac_t:-
          }$jm_cv_proto_iconv" >&5
 echo "${ECHO_T}${ac_t:-
          }$jm_cv_proto_iconv" >&6
@@ -19125,7 +19068,7 @@ EOF
     LIBICONV="-liconv"
   fi
 
-    echo "$as_me:19128: checking whether a running program can be unlinked" >&5
+    echo "$as_me:19071: checking whether a running program can be unlinked" >&5
 echo $ECHO_N "checking whether a running program can be unlinked... $ECHO_C" >&6
 if test "${jm_cv_func_unlink_busy_text+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19136,7 +19079,7 @@ else
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19139 "configure"
+#line 19082 "configure"
 #include "confdefs.h"
 
         main (argc, argv)
@@ -19150,15 +19093,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19156: \$? = $ac_status" >&5
+  echo "$as_me:19099: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19161: \$? = $ac_status" >&5
+  echo "$as_me:19104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   jm_cv_func_unlink_busy_text=yes
 else
@@ -19167,11 +19110,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 jm_cv_func_unlink_busy_text=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:19174: result: $jm_cv_func_unlink_busy_text" >&5
+echo "$as_me:19117: result: $jm_cv_func_unlink_busy_text" >&5
 echo "${ECHO_T}$jm_cv_func_unlink_busy_text" >&6
 
   if test $jm_cv_func_unlink_busy_text = no; then
@@ -19183,13 +19126,13 @@ echo "${ECHO_T}$jm_cv_func_unlink_busy_t
 for ac_func in listmntent getmntinfo
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:19186: checking for $ac_func" >&5
+echo "$as_me:19129: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19192 "configure"
+#line 19135 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -19220,16 +19163,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19226: \$? = $ac_status" >&5
+  echo "$as_me:19169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19232: \$? = $ac_status" >&5
+  echo "$as_me:19175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -19239,7 +19182,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19242: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:19185: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -19252,23 +19195,23 @@ done
 for ac_header in mntent.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:19255: checking for $ac_header" >&5
+echo "$as_me:19198: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19261 "configure"
+#line 19204 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19265: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19208: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19271: \$? = $ac_status" >&5
+  echo "$as_me:19214: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19287,7 +19230,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19290: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:19233: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -19303,7 +19246,7 @@ ac_list_mounted_fs=
 # If the getmntent function is available but not in the standard library,
 # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
 # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
-echo "$as_me:19306: checking for getmntent in -lsun" >&5
+echo "$as_me:19249: checking for getmntent in -lsun" >&5
 echo $ECHO_N "checking for getmntent in -lsun... $ECHO_C" >&6
 if test "${ac_cv_lib_sun_getmntent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19311,7 +19254,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsun  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19314 "configure"
+#line 19257 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19330,16 +19273,16 @@ getmntent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19336: \$? = $ac_status" >&5
+  echo "$as_me:19279: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19342: \$? = $ac_status" >&5
+  echo "$as_me:19285: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sun_getmntent=yes
 else
@@ -19350,12 +19293,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19353: result: $ac_cv_lib_sun_getmntent" >&5
+echo "$as_me:19296: result: $ac_cv_lib_sun_getmntent" >&5
 echo "${ECHO_T}$ac_cv_lib_sun_getmntent" >&6
 if test $ac_cv_lib_sun_getmntent = yes; then
   LIBS="-lsun $LIBS"
 else
-  echo "$as_me:19358: checking for getmntent in -lseq" >&5
+  echo "$as_me:19301: checking for getmntent in -lseq" >&5
 echo $ECHO_N "checking for getmntent in -lseq... $ECHO_C" >&6
 if test "${ac_cv_lib_seq_getmntent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19363,7 +19306,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lseq  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19366 "configure"
+#line 19309 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19382,16 +19325,16 @@ getmntent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19388: \$? = $ac_status" >&5
+  echo "$as_me:19331: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19394: \$? = $ac_status" >&5
+  echo "$as_me:19337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_seq_getmntent=yes
 else
@@ -19402,12 +19345,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19405: result: $ac_cv_lib_seq_getmntent" >&5
+echo "$as_me:19348: result: $ac_cv_lib_seq_getmntent" >&5
 echo "${ECHO_T}$ac_cv_lib_seq_getmntent" >&6
 if test $ac_cv_lib_seq_getmntent = yes; then
   LIBS="-lseq $LIBS"
 else
-  echo "$as_me:19410: checking for getmntent in -lgen" >&5
+  echo "$as_me:19353: checking for getmntent in -lgen" >&5
 echo $ECHO_N "checking for getmntent in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_getmntent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19415,7 +19358,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19418 "configure"
+#line 19361 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19434,16 +19377,16 @@ getmntent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19380: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19440: \$? = $ac_status" >&5
+  echo "$as_me:19383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19446: \$? = $ac_status" >&5
+  echo "$as_me:19389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_getmntent=yes
 else
@@ -19454,7 +19397,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19457: result: $ac_cv_lib_gen_getmntent" >&5
+echo "$as_me:19400: result: $ac_cv_lib_gen_getmntent" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_getmntent" >&6
 if test $ac_cv_lib_gen_getmntent = yes; then
   LIBS="-lgen $LIBS"
@@ -19464,13 +19407,13 @@ fi
 
 fi
 
-echo "$as_me:19467: checking for getmntent" >&5
+echo "$as_me:19410: checking for getmntent" >&5
 echo $ECHO_N "checking for getmntent... $ECHO_C" >&6
 if test "${ac_cv_func_getmntent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19473 "configure"
+#line 19416 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getmntent (); below.  */
@@ -19501,16 +19444,16 @@ f = getmntent;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19507: \$? = $ac_status" >&5
+  echo "$as_me:19450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19513: \$? = $ac_status" >&5
+  echo "$as_me:19456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getmntent=yes
 else
@@ -19520,7 +19463,7 @@ ac_cv_func_getmntent=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19523: result: $ac_cv_func_getmntent" >&5
+echo "$as_me:19466: result: $ac_cv_func_getmntent" >&5
 echo "${ECHO_T}$ac_cv_func_getmntent" >&6
 if test $ac_cv_func_getmntent = yes; then
 
@@ -19541,14 +19484,14 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # Cray UNICOS 9
-  echo "$as_me:19544: checking for listmntent of Cray/Unicos-9" >&5
+  echo "$as_me:19487: checking for listmntent of Cray/Unicos-9" >&5
 echo $ECHO_N "checking for listmntent of Cray/Unicos-9... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_cray_listmntent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   fu_cv_sys_mounted_cray_listmntent=no
       cat >conftest.$ac_ext <<_ACEOF
-#line 19551 "configure"
+#line 19494 "configure"
 #include "confdefs.h"
 #ifdef _CRAY
 yes
@@ -19565,7 +19508,7 @@ rm -f conftest*
 
 fi
 
-  echo "$as_me:19568: result: $fu_cv_sys_mounted_cray_listmntent" >&5
+  echo "$as_me:19511: result: $fu_cv_sys_mounted_cray_listmntent" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_cray_listmntent" >&6
   if test $fu_cv_sys_mounted_cray_listmntent = yes; then
     ac_list_mounted_fs=found
@@ -19584,7 +19527,7 @@ if test $ac_cv_func_getmntent = yes; the
 
   if test -z "$ac_list_mounted_fs"; then
     # 4.3BSD, SunOS, HP-UX, Dynix, Irix
-    echo "$as_me:19587: checking for one-argument getmntent function" >&5
+    echo "$as_me:19530: checking for one-argument getmntent function" >&5
 echo $ECHO_N "checking for one-argument getmntent function... $ECHO_C" >&6
     if test "${fu_cv_sys_mounted_getmntent1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19594,7 +19537,7 @@ else
 		   || fu_cv_sys_mounted_getmntent1=no
 fi
 
-    echo "$as_me:19597: result: $fu_cv_sys_mounted_getmntent1" >&5
+    echo "$as_me:19540: result: $fu_cv_sys_mounted_getmntent1" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_getmntent1" >&6
     if test $fu_cv_sys_mounted_getmntent1 = yes; then
       ac_list_mounted_fs=found
@@ -19608,13 +19551,13 @@ EOF
 
   if test -z "$ac_list_mounted_fs"; then
     # SVR4
-    echo "$as_me:19611: checking for two-argument getmntent function" >&5
+    echo "$as_me:19554: checking for two-argument getmntent function" >&5
 echo $ECHO_N "checking for two-argument getmntent function... $ECHO_C" >&6
     if test "${fu_cv_sys_mounted_getmntent2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19617 "configure"
+#line 19560 "configure"
 #include "confdefs.h"
 #include <sys/mnttab.h>
 
@@ -19629,7 +19572,7 @@ rm -f conftest*
 
 fi
 
-    echo "$as_me:19632: result: $fu_cv_sys_mounted_getmntent2" >&5
+    echo "$as_me:19575: result: $fu_cv_sys_mounted_getmntent2" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_getmntent2" >&6
     if test $fu_cv_sys_mounted_getmntent2 = yes; then
       ac_list_mounted_fs=found
@@ -19642,7 +19585,7 @@ EOF
   fi
 
   if test -z "$ac_list_mounted_fs"; then
-    { { echo "$as_me:19645: error: could not determine how to read list of mounted filesystems" >&5
+    { { echo "$as_me:19588: error: could not determine how to read list of mounted filesystems" >&5
 echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -19651,13 +19594,13 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # DEC Alpha running OSF/1.
-  echo "$as_me:19654: checking for getfsstat function" >&5
+  echo "$as_me:19597: checking for getfsstat function" >&5
 echo $ECHO_N "checking for getfsstat function... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_getsstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19660 "configure"
+#line 19603 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -19673,16 +19616,16 @@ struct statfs *stats;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19679: \$? = $ac_status" >&5
+  echo "$as_me:19622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19685: \$? = $ac_status" >&5
+  echo "$as_me:19628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_mounted_getsstat=yes
 else
@@ -19693,7 +19636,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-  echo "$as_me:19696: result: $fu_cv_sys_mounted_getsstat" >&5
+  echo "$as_me:19639: result: $fu_cv_sys_mounted_getsstat" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_getsstat" >&6
   if test $fu_cv_sys_mounted_getsstat = yes; then
     ac_list_mounted_fs=found
@@ -19707,23 +19650,23 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # AIX.
-  echo "$as_me:19710: checking for mntctl function and struct vmount" >&5
+  echo "$as_me:19653: checking for mntctl function and struct vmount" >&5
 echo $ECHO_N "checking for mntctl function and struct vmount... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_vmount+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19716 "configure"
+#line 19659 "configure"
 #include "confdefs.h"
 #include <fshelp.h>
 _ACEOF
-if { (eval echo "$as_me:19720: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19663: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19726: \$? = $ac_status" >&5
+  echo "$as_me:19669: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19743,7 +19686,7 @@ fi
 rm -f conftest.err conftest.$ac_ext
 fi
 
-  echo "$as_me:19746: result: $fu_cv_sys_mounted_vmount" >&5
+  echo "$as_me:19689: result: $fu_cv_sys_mounted_vmount" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_vmount" >&6
   if test $fu_cv_sys_mounted_vmount = yes; then
     ac_list_mounted_fs=found
@@ -19757,26 +19700,26 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # SVR3
-  echo "$as_me:19760: checking for FIXME existence of three headers" >&5
+  echo "$as_me:19703: checking for FIXME existence of three headers" >&5
 echo $ECHO_N "checking for FIXME existence of three headers... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_fread_fstyp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19766 "configure"
+#line 19709 "configure"
 #include "confdefs.h"
 
 #include <sys/statfs.h>
 #include <sys/fstyp.h>
 #include <mnttab.h>
 _ACEOF
-if { (eval echo "$as_me:19773: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19716: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19779: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19796,7 +19739,7 @@ fi
 rm -f conftest.err conftest.$ac_ext
 fi
 
-  echo "$as_me:19799: result: $fu_cv_sys_mounted_fread_fstyp" >&5
+  echo "$as_me:19742: result: $fu_cv_sys_mounted_fread_fstyp" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_fread_fstyp" >&6
   if test $fu_cv_sys_mounted_fread_fstyp = yes; then
     ac_list_mounted_fs=found
@@ -19810,7 +19753,7 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # 4.4BSD and DEC OSF/1.
-  echo "$as_me:19813: checking for getmntinfo function" >&5
+  echo "$as_me:19756: checking for getmntinfo function" >&5
 echo $ECHO_N "checking for getmntinfo function... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_getmntinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19819,7 +19762,7 @@ else
       ok=
       if test $ac_cv_func_getmntinfo = yes; then
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19822 "configure"
+#line 19765 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 
@@ -19837,7 +19780,7 @@ rm -f conftest*
 
 fi
 
-  echo "$as_me:19840: result: $fu_cv_sys_mounted_getmntinfo" >&5
+  echo "$as_me:19783: result: $fu_cv_sys_mounted_getmntinfo" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo" >&6
   if test $fu_cv_sys_mounted_getmntinfo = yes; then
     ac_list_mounted_fs=found
@@ -19851,25 +19794,25 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # Ultrix
-  echo "$as_me:19854: checking for getmnt function" >&5
+  echo "$as_me:19797: checking for getmnt function" >&5
 echo $ECHO_N "checking for getmnt function... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_getmnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19860 "configure"
+#line 19803 "configure"
 #include "confdefs.h"
 
 #include <sys/fs_types.h>
 #include <sys/mount.h>
 _ACEOF
-if { (eval echo "$as_me:19866: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19809: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19872: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19889,7 +19832,7 @@ fi
 rm -f conftest.err conftest.$ac_ext
 fi
 
-  echo "$as_me:19892: result: $fu_cv_sys_mounted_getmnt" >&5
+  echo "$as_me:19835: result: $fu_cv_sys_mounted_getmnt" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_getmnt" >&6
   if test $fu_cv_sys_mounted_getmnt = yes; then
     ac_list_mounted_fs=found
@@ -19907,13 +19850,13 @@ if test -z "$ac_list_mounted_fs"; then
 for ac_func in next_dev fs_stat_dev
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:19910: checking for $ac_func" >&5
+echo "$as_me:19853: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19916 "configure"
+#line 19859 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -19944,16 +19887,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19890: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19950: \$? = $ac_status" >&5
+  echo "$as_me:19893: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19956: \$? = $ac_status" >&5
+  echo "$as_me:19899: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -19963,7 +19906,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19966: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:19909: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -19976,23 +19919,23 @@ done
 for ac_header in fs_info.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:19979: checking for $ac_header" >&5
+echo "$as_me:19922: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19985 "configure"
+#line 19928 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19989: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19932: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19995: \$? = $ac_status" >&5
+  echo "$as_me:19938: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20011,7 +19954,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20014: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:19957: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -20021,7 +19964,7 @@ EOF
 fi
 done
 
-  echo "$as_me:20024: checking for BEOS mounted file system support functions" >&5
+  echo "$as_me:19967: checking for BEOS mounted file system support functions" >&5
 echo $ECHO_N "checking for BEOS mounted file system support functions... $ECHO_C" >&6
   if test $ac_cv_header_fs_info_h = yes \
       && test $ac_cv_func_next_dev = yes \
@@ -20030,7 +19973,7 @@ echo $ECHO_N "checking for BEOS mounted 
   else
     fu_result=no
   fi
-  echo "$as_me:20033: result: $fu_result" >&5
+  echo "$as_me:19976: result: $fu_result" >&5
 echo "${ECHO_T}$fu_result" >&6
   if test $fu_result = yes; then
     ac_list_mounted_fs=found
@@ -20044,23 +19987,23 @@ fi
 
 if test -z "$ac_list_mounted_fs"; then
   # SVR2
-  echo "$as_me:20047: checking whether it is possible to resort to fread on /etc/mnttab" >&5
+  echo "$as_me:19990: checking whether it is possible to resort to fread on /etc/mnttab" >&5
 echo $ECHO_N "checking whether it is possible to resort to fread on /etc/mnttab... $ECHO_C" >&6
   if test "${fu_cv_sys_mounted_fread+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20053 "configure"
+#line 19996 "configure"
 #include "confdefs.h"
 #include <mnttab.h>
 _ACEOF
-if { (eval echo "$as_me:20057: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20000: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20063: \$? = $ac_status" >&5
+  echo "$as_me:20006: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20080,7 +20023,7 @@ fi
 rm -f conftest.err conftest.$ac_ext
 fi
 
-  echo "$as_me:20083: result: $fu_cv_sys_mounted_fread" >&5
+  echo "$as_me:20026: result: $fu_cv_sys_mounted_fread" >&5
 echo "${ECHO_T}$fu_cv_sys_mounted_fread" >&6
   if test $fu_cv_sys_mounted_fread = yes; then
     ac_list_mounted_fs=found
@@ -20093,7 +20036,7 @@ EOF
 fi
 
 if test -z "$ac_list_mounted_fs"; then
-  { { echo "$as_me:20096: error: could not determine how to read list of mounted filesystems" >&5
+  { { echo "$as_me:20039: error: could not determine how to read list of mounted filesystems" >&5
 echo "$as_me: error: could not determine how to read list of mounted filesystems" >&2;}
    { (exit 1); exit 1; }; }
   # FIXME -- no need to abort building the whole package
@@ -20106,14 +20049,14 @@ else
   list_mounted_fs=no
 fi
 
-    echo "$as_me:20109: checking for f_fstypename in struct statfs" >&5
+    echo "$as_me:20052: checking for f_fstypename in struct statfs" >&5
 echo $ECHO_N "checking for f_fstypename in struct statfs... $ECHO_C" >&6
 if test "${fu_cv_sys_f_fstypename_in_statfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20116 "configure"
+#line 20059 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20129,16 +20072,16 @@ struct statfs s; int i = sizeof s.f_fsty
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20135: \$? = $ac_status" >&5
+  echo "$as_me:20078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20141: \$? = $ac_status" >&5
+  echo "$as_me:20084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_f_fstypename_in_statfs=yes
 else
@@ -20150,7 +20093,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:20153: result: $fu_cv_sys_f_fstypename_in_statfs" >&5
+echo "$as_me:20096: result: $fu_cv_sys_f_fstypename_in_statfs" >&5
 echo "${ECHO_T}$fu_cv_sys_f_fstypename_in_statfs" >&6
 
     if test $fu_cv_sys_f_fstypename_in_statfs = yes; then
@@ -20172,13 +20115,13 @@ ac_fsusage_space=no
 # is what it gets when this test fails.
 if test $ac_fsusage_space = no; then
   # SVR4
-  echo "$as_me:20175: checking for statvfs function (SVR4)" >&5
+  echo "$as_me:20118: checking for statvfs function (SVR4)" >&5
 echo $ECHO_N "checking for statvfs function (SVR4)... $ECHO_C" >&6
 if test "${fu_cv_sys_stat_statvfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20181 "configure"
+#line 20124 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statvfs.h>
@@ -20191,16 +20134,16 @@ struct statvfs fsd; statvfs (0, &fsd);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20197: \$? = $ac_status" >&5
+  echo "$as_me:20140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20203: \$? = $ac_status" >&5
+  echo "$as_me:20146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_stat_statvfs=yes
 else
@@ -20210,7 +20153,7 @@ fu_cv_sys_stat_statvfs=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20213: result: $fu_cv_sys_stat_statvfs" >&5
+echo "$as_me:20156: result: $fu_cv_sys_stat_statvfs" >&5
 echo "${ECHO_T}$fu_cv_sys_stat_statvfs" >&6
   if test $fu_cv_sys_stat_statvfs = yes; then
     ac_fsusage_space=yes
@@ -20224,7 +20167,7 @@ fi
 
 if test $ac_fsusage_space = no; then
   # DEC Alpha running OSF/1
-  echo "$as_me:20227: checking for 3-argument statfs function (DEC OSF/1)" >&5
+  echo "$as_me:20170: checking for 3-argument statfs function (DEC OSF/1)" >&5
 echo $ECHO_N "checking for 3-argument statfs function (DEC OSF/1)... $ECHO_C" >&6
   if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20233,7 +20176,7 @@ else
   fu_cv_sys_stat_statfs3_osf1=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20236 "configure"
+#line 20179 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20247,15 +20190,15 @@ else
   }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20253: \$? = $ac_status" >&5
+  echo "$as_me:20196: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20258: \$? = $ac_status" >&5
+  echo "$as_me:20201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_stat_statfs3_osf1=yes
 else
@@ -20264,11 +20207,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fu_cv_sys_stat_statfs3_osf1=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 
-  echo "$as_me:20271: result: $fu_cv_sys_stat_statfs3_osf1" >&5
+  echo "$as_me:20214: result: $fu_cv_sys_stat_statfs3_osf1" >&5
 echo "${ECHO_T}$fu_cv_sys_stat_statfs3_osf1" >&6
   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
     ac_fsusage_space=yes
@@ -20282,7 +20225,7 @@ fi
 
 if test $ac_fsusage_space = no; then
 # AIX
-  echo "$as_me:20285: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+  echo "$as_me:20228: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
 echo $ECHO_N "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... $ECHO_C" >&6
   if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20291,7 +20234,7 @@ else
   fu_cv_sys_stat_statfs2_bsize=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20294 "configure"
+#line 20237 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_PARAM_H
@@ -20311,15 +20254,15 @@ else
   }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20317: \$? = $ac_status" >&5
+  echo "$as_me:20260: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20322: \$? = $ac_status" >&5
+  echo "$as_me:20265: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_stat_statfs2_bsize=yes
 else
@@ -20328,11 +20271,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fu_cv_sys_stat_statfs2_bsize=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 
-  echo "$as_me:20335: result: $fu_cv_sys_stat_statfs2_bsize" >&5
+  echo "$as_me:20278: result: $fu_cv_sys_stat_statfs2_bsize" >&5
 echo "${ECHO_T}$fu_cv_sys_stat_statfs2_bsize" >&6
   if test $fu_cv_sys_stat_statfs2_bsize = yes; then
     ac_fsusage_space=yes
@@ -20346,7 +20289,7 @@ fi
 
 if test $ac_fsusage_space = no; then
 # SVR3
-  echo "$as_me:20349: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+  echo "$as_me:20292: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
 echo $ECHO_N "checking for four-argument statfs (AIX-3.2.5, SVR3)... $ECHO_C" >&6
   if test "${fu_cv_sys_stat_statfs4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20355,7 +20298,7 @@ else
   fu_cv_sys_stat_statfs4=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20358 "configure"
+#line 20301 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statfs.h>
@@ -20366,15 +20309,15 @@ else
   }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20372: \$? = $ac_status" >&5
+  echo "$as_me:20315: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20377: \$? = $ac_status" >&5
+  echo "$as_me:20320: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_stat_statfs4=yes
 else
@@ -20383,11 +20326,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fu_cv_sys_stat_statfs4=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 
-  echo "$as_me:20390: result: $fu_cv_sys_stat_statfs4" >&5
+  echo "$as_me:20333: result: $fu_cv_sys_stat_statfs4" >&5
 echo "${ECHO_T}$fu_cv_sys_stat_statfs4" >&6
   if test $fu_cv_sys_stat_statfs4 = yes; then
     ac_fsusage_space=yes
@@ -20401,7 +20344,7 @@ fi
 
 if test $ac_fsusage_space = no; then
 # 4.4BSD and NetBSD
-  echo "$as_me:20404: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
+  echo "$as_me:20347: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
 echo $ECHO_N "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... $ECHO_C" >&6
   if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20410,7 +20353,7 @@ else
   fu_cv_sys_stat_statfs2_fsize=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20413 "configure"
+#line 20356 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -20427,15 +20370,15 @@ else
   }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20433: \$? = $ac_status" >&5
+  echo "$as_me:20376: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20438: \$? = $ac_status" >&5
+  echo "$as_me:20381: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_stat_statfs2_fsize=yes
 else
@@ -20444,11 +20387,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fu_cv_sys_stat_statfs2_fsize=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 
-  echo "$as_me:20451: result: $fu_cv_sys_stat_statfs2_fsize" >&5
+  echo "$as_me:20394: result: $fu_cv_sys_stat_statfs2_fsize" >&5
 echo "${ECHO_T}$fu_cv_sys_stat_statfs2_fsize" >&6
   if test $fu_cv_sys_stat_statfs2_fsize = yes; then
     ac_fsusage_space=yes
@@ -20462,7 +20405,7 @@ fi
 
 if test $ac_fsusage_space = no; then
   # Ultrix
-  echo "$as_me:20465: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+  echo "$as_me:20408: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
 echo $ECHO_N "checking for two-argument statfs with struct fs_data (Ultrix)... $ECHO_C" >&6
   if test "${fu_cv_sys_stat_fs_data+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20471,7 +20414,7 @@ else
   fu_cv_sys_stat_fs_data=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20474 "configure"
+#line 20417 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -20492,15 +20435,15 @@ else
   }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20498: \$? = $ac_status" >&5
+  echo "$as_me:20441: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20503: \$? = $ac_status" >&5
+  echo "$as_me:20446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_stat_fs_data=yes
 else
@@ -20509,11 +20452,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fu_cv_sys_stat_fs_data=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
 
-  echo "$as_me:20516: result: $fu_cv_sys_stat_fs_data" >&5
+  echo "$as_me:20459: result: $fu_cv_sys_stat_fs_data" >&5
 echo "${ECHO_T}$fu_cv_sys_stat_fs_data" >&6
   if test $fu_cv_sys_stat_fs_data = yes; then
     ac_fsusage_space=yes
@@ -20528,18 +20471,18 @@ fi
 if test $ac_fsusage_space = no; then
   # SVR2
   cat >conftest.$ac_ext <<_ACEOF
-#line 20531 "configure"
+#line 20474 "configure"
 #include "confdefs.h"
 #include <sys/filsys.h>
 
 _ACEOF
-if { (eval echo "$as_me:20536: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20479: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20542: \$? = $ac_status" >&5
+  echo "$as_me:20485: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20576,13 +20519,13 @@ fi
     LIBOBJS="$LIBOBJS mountlist.$ac_objext"
   fi
 
-echo "$as_me:20579: checking POSIX termios" >&5
+echo "$as_me:20522: checking POSIX termios" >&5
 echo $ECHO_N "checking POSIX termios... $ECHO_C" >&6
 if test "${am_cv_sys_posix_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20585 "configure"
+#line 20528 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <unistd.h>
@@ -20597,16 +20540,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20543: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20603: \$? = $ac_status" >&5
+  echo "$as_me:20546: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20609: \$? = $ac_status" >&5
+  echo "$as_me:20552: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_sys_posix_termios=yes
 else
@@ -20616,10 +20559,10 @@ am_cv_sys_posix_termios=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20619: result: $am_cv_sys_posix_termios" >&5
+echo "$as_me:20562: result: $am_cv_sys_posix_termios" >&5
 echo "${ECHO_T}$am_cv_sys_posix_termios" >&6
 
- echo "$as_me:20622: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
+ echo "$as_me:20565: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
 echo $ECHO_N "checking whether use of TIOCGWINSZ requires sys/ioctl.h... $ECHO_C" >&6
 if test "${am_cv_sys_tiocgwinsz_needs_sys_ioctl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20629,7 +20572,7 @@ else
   gwinsz_in_termios_h=no
   if test $am_cv_sys_posix_termios = yes; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 20632 "configure"
+#line 20575 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #     include <termios.h>
@@ -20648,7 +20591,7 @@ rm -f conftest*
 
   if test $gwinsz_in_termios_h = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 20651 "configure"
+#line 20594 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #     include <sys/ioctl.h>
@@ -20666,7 +20609,7 @@ rm -f conftest*
   fi
 
 fi
-echo "$as_me:20669: result: $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&5
+echo "$as_me:20612: result: $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&5
 echo "${ECHO_T}$am_cv_sys_tiocgwinsz_needs_sys_ioctl_h" >&6
   if test $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
 
@@ -20676,23 +20619,23 @@ EOF
 
   fi
 
-echo "$as_me:20679: checking for sys/ptem.h" >&5
+echo "$as_me:20622: checking for sys/ptem.h" >&5
 echo $ECHO_N "checking for sys/ptem.h... $ECHO_C" >&6
 if test "${ac_cv_header_sys_ptem_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20685 "configure"
+#line 20628 "configure"
 #include "confdefs.h"
 #include <sys/ptem.h>
 _ACEOF
-if { (eval echo "$as_me:20689: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20632: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20695: \$? = $ac_status" >&5
+  echo "$as_me:20638: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20711,7 +20654,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20714: result: $ac_cv_header_sys_ptem_h" >&5
+echo "$as_me:20657: result: $ac_cv_header_sys_ptem_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_ptem_h" >&6
 if test $ac_cv_header_sys_ptem_h = yes; then
 
@@ -20724,13 +20667,13 @@ fi
 # Check for SunOS statfs brokenness wrt partitions 2GB and larger.
 # If <sys/vfs.h> exists and struct statfs has a member named f_spare,
 # enable the work-around code in fsusage.c.
-echo "$as_me:20727: checking for statfs that truncates block counts" >&5
+echo "$as_me:20670: checking for statfs that truncates block counts" >&5
 echo $ECHO_N "checking for statfs that truncates block counts... $ECHO_C" >&6
 if test "${fu_cv_sys_truncating_statfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20733 "configure"
+#line 20676 "configure"
 #include "confdefs.h"
 
 #if !defined(sun) && !defined(__sun)
@@ -20747,16 +20690,16 @@ struct statfs t; long c = *(t.f_spare);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20753: \$? = $ac_status" >&5
+  echo "$as_me:20696: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20759: \$? = $ac_status" >&5
+  echo "$as_me:20702: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   fu_cv_sys_truncating_statfs=yes
 else
@@ -20774,12 +20717,84 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:20777: result: $fu_cv_sys_truncating_statfs" >&5
+echo "$as_me:20720: result: $fu_cv_sys_truncating_statfs" >&5
 echo "${ECHO_T}$fu_cv_sys_truncating_statfs" >&6
 
+# (rich@phekda.freeserve.co.uk): Check for lstat and fchown, which DJGPP
+# doesn't have.
+
+for ac_func in lstat fchown
+do
+ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+echo "$as_me:20729: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$ac_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 20735 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:20766: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:20769: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20772: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:20775: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$ac_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$ac_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:20785: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+if test `eval echo '${'$ac_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+EOF
+
+fi
+done
+
   # Check for libypsec.a on Dolphin M88K machines.
 
-echo "$as_me:20782: checking for main in -lypsec" >&5
+echo "$as_me:20797: checking for main in -lypsec" >&5
 echo $ECHO_N "checking for main in -lypsec... $ECHO_C" >&6
 if test "${ac_cv_lib_ypsec_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20787,7 +20802,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lypsec  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20790 "configure"
+#line 20805 "configure"
 #include "confdefs.h"
 
 int
@@ -20799,16 +20814,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20805: \$? = $ac_status" >&5
+  echo "$as_me:20820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20811: \$? = $ac_status" >&5
+  echo "$as_me:20826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ypsec_main=yes
 else
@@ -20819,7 +20834,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20822: result: $ac_cv_lib_ypsec_main" >&5
+echo "$as_me:20837: result: $ac_cv_lib_ypsec_main" >&5
 echo "${ECHO_T}$ac_cv_lib_ypsec_main" >&6
 if test $ac_cv_lib_ypsec_main = yes; then
   cat >>confdefs.h <<EOF
@@ -20832,7 +20847,7 @@ fi
 
   # m88k running dgux 5.4 needs this
 
-echo "$as_me:20835: checking for main in -lldgc" >&5
+echo "$as_me:20850: checking for main in -lldgc" >&5
 echo $ECHO_N "checking for main in -lldgc... $ECHO_C" >&6
 if test "${ac_cv_lib_ldgc_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20840,7 +20855,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldgc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20843 "configure"
+#line 20858 "configure"
 #include "confdefs.h"
 
 int
@@ -20852,16 +20867,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20858: \$? = $ac_status" >&5
+  echo "$as_me:20873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20864: \$? = $ac_status" >&5
+  echo "$as_me:20879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ldgc_main=yes
 else
@@ -20872,7 +20887,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20875: result: $ac_cv_lib_ldgc_main" >&5
+echo "$as_me:20890: result: $ac_cv_lib_ldgc_main" >&5
 echo "${ECHO_T}$ac_cv_lib_ldgc_main" >&6
 if test $ac_cv_lib_ldgc_main = yes; then
   cat >>confdefs.h <<EOF
@@ -20895,13 +20910,13 @@ fi
 for ac_func in floor modf rint
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:20898: checking for $ac_func" >&5
+echo "$as_me:20913: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20904 "configure"
+#line 20919 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -20932,16 +20947,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20938: \$? = $ac_status" >&5
+  echo "$as_me:20953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20944: \$? = $ac_status" >&5
+  echo "$as_me:20959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -20951,7 +20966,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20954: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:20969: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -20966,13 +20981,13 @@ done
 for ac_func in sqrt
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:20969: checking for $ac_func" >&5
+echo "$as_me:20984: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20975 "configure"
+#line 20990 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21003,16 +21018,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21009: \$? = $ac_status" >&5
+  echo "$as_me:21024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21015: \$? = $ac_status" >&5
+  echo "$as_me:21030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -21022,7 +21037,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21025: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:21040: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21033,7 +21048,7 @@ fi
 done
 
   if test $ac_cv_func_sqrt = no; then
-    echo "$as_me:21036: checking for sqrt in -lm" >&5
+    echo "$as_me:21051: checking for sqrt in -lm" >&5
 echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_sqrt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21041,7 +21056,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21044 "configure"
+#line 21059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21060,16 +21075,16 @@ sqrt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21066: \$? = $ac_status" >&5
+  echo "$as_me:21081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21072: \$? = $ac_status" >&5
+  echo "$as_me:21087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_sqrt=yes
 else
@@ -21080,7 +21095,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21083: result: $ac_cv_lib_m_sqrt" >&5
+echo "$as_me:21098: result: $ac_cv_lib_m_sqrt" >&5
 echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
 if test $ac_cv_lib_m_sqrt = yes; then
   SQRT_LIBM=-lm
@@ -21091,13 +21106,13 @@ fi
 for ac_func in fesetround
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:21094: checking for $ac_func" >&5
+echo "$as_me:21109: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21100 "configure"
+#line 21115 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21128,16 +21143,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21134: \$? = $ac_status" >&5
+  echo "$as_me:21149: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21140: \$? = $ac_status" >&5
+  echo "$as_me:21155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -21147,7 +21162,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21150: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:21165: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21158,7 +21173,7 @@ fi
 done
 
   if test $ac_cv_func_fesetround = no; then
-    echo "$as_me:21161: checking for fesetround in -lm" >&5
+    echo "$as_me:21176: checking for fesetround in -lm" >&5
 echo $ECHO_N "checking for fesetround in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_fesetround+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21166,7 +21181,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21169 "configure"
+#line 21184 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21185,16 +21200,16 @@ fesetround ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21191: \$? = $ac_status" >&5
+  echo "$as_me:21206: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21197: \$? = $ac_status" >&5
+  echo "$as_me:21212: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_fesetround=yes
 else
@@ -21205,7 +21220,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21208: result: $ac_cv_lib_m_fesetround" >&5
+echo "$as_me:21223: result: $ac_cv_lib_m_fesetround" >&5
 echo "${ECHO_T}$ac_cv_lib_m_fesetround" >&6
 if test $ac_cv_lib_m_fesetround = yes; then
   FESETROUND_LIBM=-lm
@@ -21216,7 +21231,7 @@ fi
   # The -lsun library is required for YP support on Irix-4.0.5 systems.
   # m88k/svr3 DolphinOS systems using YP need -lypsec for id.
 
-  echo "$as_me:21219: checking for library containing yp_match" >&5
+  echo "$as_me:21234: checking for library containing yp_match" >&5
 echo $ECHO_N "checking for library containing yp_match... $ECHO_C" >&6
 if test "${ac_cv_search_yp_match+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21225,7 +21240,7 @@ else
     ac_func_search_save_LIBS=$LIBS
     ac_cv_search_yp_match=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 21228 "configure"
+#line 21243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21244,16 +21259,16 @@ yp_match ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21250: \$? = $ac_status" >&5
+  echo "$as_me:21265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21256: \$? = $ac_status" >&5
+  echo "$as_me:21271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_yp_match='none required'
 else
@@ -21265,7 +21280,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       for ac_lib in sun ypsec; do
 	LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21268 "configure"
+#line 21283 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21284,16 +21299,16 @@ yp_match ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21290: \$? = $ac_status" >&5
+  echo "$as_me:21305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21296: \$? = $ac_status" >&5
+  echo "$as_me:21311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_yp_match="-l$ac_lib"; break
 else
@@ -21306,7 +21321,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     LIBS=$ac_func_search_save_LIBS
 
 fi
-echo "$as_me:21309: result: $ac_cv_search_yp_match" >&5
+echo "$as_me:21324: result: $ac_cv_search_yp_match" >&5
 echo "${ECHO_T}$ac_cv_search_yp_match" >&6
 
   if test "$ac_cv_search_yp_match" = no; then :
@@ -21323,7 +21338,7 @@ echo "${ECHO_T}$ac_cv_search_yp_match" >
   # SysV needs -lsec, older versions of Linux need -lshadow for
   # shadow passwords.  UnixWare 7 needs -lgen.
 
-  echo "$as_me:21326: checking for library containing getspnam" >&5
+  echo "$as_me:21341: checking for library containing getspnam" >&5
 echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6
 if test "${ac_cv_search_getspnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21332,7 +21347,7 @@ else
     ac_func_search_save_LIBS=$LIBS
     ac_cv_search_getspnam=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 21335 "configure"
+#line 21350 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21351,16 +21366,16 @@ getspnam ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21357: \$? = $ac_status" >&5
+  echo "$as_me:21372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21363: \$? = $ac_status" >&5
+  echo "$as_me:21378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_getspnam='none required'
 else
@@ -21372,7 +21387,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       for ac_lib in shadow sec gen; do
 	LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21375 "configure"
+#line 21390 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21391,16 +21406,16 @@ getspnam ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21397: \$? = $ac_status" >&5
+  echo "$as_me:21412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21403: \$? = $ac_status" >&5
+  echo "$as_me:21418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_getspnam="-l$ac_lib"; break
 else
@@ -21413,7 +21428,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     LIBS=$ac_func_search_save_LIBS
 
 fi
-echo "$as_me:21416: result: $ac_cv_search_getspnam" >&5
+echo "$as_me:21431: result: $ac_cv_search_getspnam" >&5
 echo "${ECHO_T}$ac_cv_search_getspnam" >&6
 
   if test "$ac_cv_search_getspnam" = no; then :
@@ -21430,23 +21445,23 @@ echo "${ECHO_T}$ac_cv_search_getspnam" >
 for ac_header in shadow.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:21433: checking for $ac_header" >&5
+echo "$as_me:21448: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21439 "configure"
+#line 21454 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21443: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21458: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21449: \$? = $ac_status" >&5
+  echo "$as_me:21464: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21465,7 +21480,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21468: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:21483: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21482,13 +21497,13 @@ $ac_includes_default
 # include <shadow.h>
 #endif
 "
-  echo "$as_me:21485: checking for struct spwd.sp_pwdp" >&5
+  echo "$as_me:21500: checking for struct spwd.sp_pwdp" >&5
 echo $ECHO_N "checking for struct spwd.sp_pwdp... $ECHO_C" >&6
 if test "${ac_cv_member_struct_spwd_sp_pwdp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21491 "configure"
+#line 21506 "configure"
 #include "confdefs.h"
 $shadow_includes
 
@@ -21502,16 +21517,16 @@ foo.sp_pwdp;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21505: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21508: \$? = $ac_status" >&5
+  echo "$as_me:21523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21514: \$? = $ac_status" >&5
+  echo "$as_me:21529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_spwd_sp_pwdp=yes
 else
@@ -21521,7 +21536,7 @@ ac_cv_member_struct_spwd_sp_pwdp=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21524: result: $ac_cv_member_struct_spwd_sp_pwdp" >&5
+echo "$as_me:21539: result: $ac_cv_member_struct_spwd_sp_pwdp" >&5
 echo "${ECHO_T}$ac_cv_member_struct_spwd_sp_pwdp" >&6
 if test $ac_cv_member_struct_spwd_sp_pwdp = yes; then
 
@@ -21534,13 +21549,13 @@ fi
 for ac_func in getspnam
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:21537: checking for $ac_func" >&5
+echo "$as_me:21552: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21543 "configure"
+#line 21558 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21571,16 +21586,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21577: \$? = $ac_status" >&5
+  echo "$as_me:21592: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21583: \$? = $ac_status" >&5
+  echo "$as_me:21598: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -21590,7 +21605,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21593: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:21608: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21604,7 +21619,7 @@ done
   # NetBSD needs -lcrypt for crypt.
   ac_su_saved_lib="$LIBS"
 
-  echo "$as_me:21607: checking for library containing crypt" >&5
+  echo "$as_me:21622: checking for library containing crypt" >&5
 echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
 if test "${ac_cv_search_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21613,7 +21628,7 @@ else
     ac_func_search_save_LIBS=$LIBS
     ac_cv_search_crypt=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 21616 "configure"
+#line 21631 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21632,16 +21647,16 @@ crypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21638: \$? = $ac_status" >&5
+  echo "$as_me:21653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21644: \$? = $ac_status" >&5
+  echo "$as_me:21659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_crypt='none required'
 else
@@ -21653,7 +21668,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
       for ac_lib in ufc crypt; do
 	LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21656 "configure"
+#line 21671 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21672,16 +21687,16 @@ crypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21678: \$? = $ac_status" >&5
+  echo "$as_me:21693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21684: \$? = $ac_status" >&5
+  echo "$as_me:21699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_crypt="-l$ac_lib"; break
 else
@@ -21694,7 +21709,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
     LIBS=$ac_func_search_save_LIBS
 
 fi
-echo "$as_me:21697: result: $ac_cv_search_crypt" >&5
+echo "$as_me:21712: result: $ac_cv_search_crypt" >&5
 echo "${ECHO_T}$ac_cv_search_crypt" >&6
 
   if test "$ac_cv_search_crypt" = no; then :
@@ -21713,23 +21728,23 @@ echo "${ECHO_T}$ac_cv_search_crypt" >&6
 for ac_header in stdlib.h unistd.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:21716: checking for $ac_header" >&5
+echo "$as_me:21731: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21722 "configure"
+#line 21737 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21726: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21741: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:21732: \$? = $ac_status" >&5
+  echo "$as_me:21747: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21748,7 +21763,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21751: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:21766: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21761,13 +21776,13 @@ done
 for ac_func in getpagesize
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:21764: checking for $ac_func" >&5
+echo "$as_me:21779: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21770 "configure"
+#line 21785 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21798,16 +21813,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21804: \$? = $ac_status" >&5
+  echo "$as_me:21819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21810: \$? = $ac_status" >&5
+  echo "$as_me:21825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -21817,7 +21832,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21820: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:21835: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -21827,7 +21842,7 @@ EOF
 fi
 done
 
-echo "$as_me:21830: checking for working mmap" >&5
+echo "$as_me:21845: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21836,7 +21851,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21839 "configure"
+#line 21854 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Haertel and Jim Avera for this test.
    Here is a matrix of mmap possibilities:
@@ -21968,15 +21983,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21974: \$? = $ac_status" >&5
+  echo "$as_me:21989: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21979: \$? = $ac_status" >&5
+  echo "$as_me:21994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -21985,10 +22000,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-echo "$as_me:21991: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:22006: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -22003,23 +22018,23 @@ for ac_header in argz.h limits.h locale.
 unistd.h sys/param.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:22006: checking for $ac_header" >&5
+echo "$as_me:22021: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22012 "configure"
+#line 22027 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22016: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22031: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22022: \$? = $ac_status" >&5
+  echo "$as_me:22037: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22038,7 +22053,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22041: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "$as_me:22056: result: `eval echo '${'$ac_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -22052,13 +22067,13 @@ for ac_func in getcwd munmap putenv sete
 strdup __argz_count __argz_stringify __argz_next
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:22055: checking for $ac_func" >&5
+echo "$as_me:22070: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22061 "configure"
+#line 22076 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22089,16 +22104,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22107: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22095: \$? = $ac_status" >&5
+  echo "$as_me:22110: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22101: \$? = $ac_status" >&5
+  echo "$as_me:22116: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -22108,7 +22123,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22111: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:22126: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -22123,13 +22138,13 @@ done
 for ac_func in stpcpy
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:22126: checking for $ac_func" >&5
+echo "$as_me:22141: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22132 "configure"
+#line 22147 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22160,16 +22175,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22166: \$? = $ac_status" >&5
+  echo "$as_me:22181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22172: \$? = $ac_status" >&5
+  echo "$as_me:22187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -22179,7 +22194,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22182: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:22197: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -22199,13 +22214,13 @@ EOF
    fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:22202: checking for LC_MESSAGES" >&5
+    echo "$as_me:22217: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22208 "configure"
+#line 22223 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -22217,16 +22232,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22223: \$? = $ac_status" >&5
+  echo "$as_me:22238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22229: \$? = $ac_status" >&5
+  echo "$as_me:22244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -22236,7 +22251,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22239: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:22254: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -22246,7 +22261,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:22249: checking whether NLS is requested" >&5
+   echo "$as_me:22264: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
@@ -22255,7 +22270,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=yes
 fi;
-    echo "$as_me:22258: result: $USE_NLS" >&5
+    echo "$as_me:22273: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
     USE_INCLUDED_LIBINTL=no
@@ -22266,7 +22281,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-      echo "$as_me:22269: checking whether included gettext is requested" >&5
+      echo "$as_me:22284: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -22276,7 +22291,7 @@ if test "${with_included_gettext+set}" =
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-      echo "$as_me:22279: result: $nls_cv_force_use_gnu_gettext" >&5
+      echo "$as_me:22294: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -22285,23 +22300,23 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get
 	nls_cv_header_libgt=
 	CATOBJEXT=NONE
 
-	echo "$as_me:22288: checking for libintl.h" >&5
+	echo "$as_me:22303: checking for libintl.h" >&5
 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
 if test "${ac_cv_header_libintl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22294 "configure"
+#line 22309 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 _ACEOF
-if { (eval echo "$as_me:22298: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22313: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22304: \$? = $ac_status" >&5
+  echo "$as_me:22319: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22320,16 +22335,16 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22323: result: $ac_cv_header_libintl_h" >&5
+echo "$as_me:22338: result: $ac_cv_header_libintl_h" >&5
 echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
 if test $ac_cv_header_libintl_h = yes; then
-  echo "$as_me:22326: checking for gettext in libc" >&5
+  echo "$as_me:22341: checking for gettext in libc" >&5
 echo $ECHO_N "checking for gettext in libc... $ECHO_C" >&6
 if test "${gt_cv_func_gettext_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22332 "configure"
+#line 22347 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int
@@ -22341,16 +22356,16 @@ return (int) gettext ("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22347: \$? = $ac_status" >&5
+  echo "$as_me:22362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22353: \$? = $ac_status" >&5
+  echo "$as_me:22368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   gt_cv_func_gettext_libc=yes
 else
@@ -22360,11 +22375,11 @@ gt_cv_func_gettext_libc=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22363: result: $gt_cv_func_gettext_libc" >&5
+echo "$as_me:22378: result: $gt_cv_func_gettext_libc" >&5
 echo "${ECHO_T}$gt_cv_func_gettext_libc" >&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     echo "$as_me:22367: checking for bindtextdomain in -lintl" >&5
+	     echo "$as_me:22382: checking for bindtextdomain in -lintl" >&5
 echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22372,7 +22387,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22375 "configure"
+#line 22390 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22391,16 +22406,16 @@ bindtextdomain ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22409: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22397: \$? = $ac_status" >&5
+  echo "$as_me:22412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22403: \$? = $ac_status" >&5
+  echo "$as_me:22418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_bindtextdomain=yes
 else
@@ -22411,11 +22426,11 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22414: result: $ac_cv_lib_intl_bindtextdomain" >&5
+echo "$as_me:22429: result: $ac_cv_lib_intl_bindtextdomain" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
 if test $ac_cv_lib_intl_bindtextdomain = yes; then
 
-echo "$as_me:22418: checking for gettext in -lintl" >&5
+echo "$as_me:22433: checking for gettext in -lintl" >&5
 echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22423,7 +22438,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22426 "configure"
+#line 22441 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22442,16 +22457,16 @@ gettext ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22448: \$? = $ac_status" >&5
+  echo "$as_me:22463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22454: \$? = $ac_status" >&5
+  echo "$as_me:22469: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_gettext=yes
 else
@@ -22462,7 +22477,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22465: result: $ac_cv_lib_intl_gettext" >&5
+echo "$as_me:22480: result: $ac_cv_lib_intl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6
 if test $ac_cv_lib_intl_gettext = yes; then
   cat >>confdefs.h <<EOF
@@ -22486,7 +22501,7 @@ EOF
 
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:22489: checking for $ac_word" >&5
+echo "$as_me:22504: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22513,10 +22528,10 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
-  echo "$as_me:22516: result: $MSGFMT" >&5
+  echo "$as_me:22531: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:22519: result: no" >&5
+  echo "$as_me:22534: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 	      if test "$MSGFMT" != "no"; then
@@ -22524,13 +22539,13 @@ fi
 for ac_func in dcgettext
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:22527: checking for $ac_func" >&5
+echo "$as_me:22542: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22533 "configure"
+#line 22548 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22561,16 +22576,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22579: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22567: \$? = $ac_status" >&5
+  echo "$as_me:22582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22573: \$? = $ac_status" >&5
+  echo "$as_me:22588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$ac_ac_var=yes"
 else
@@ -22580,7 +22595,7 @@ eval "$ac_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22583: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "$as_me:22598: result: `eval echo '${'$ac_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -22592,7 +22607,7 @@ done
 
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:22595: checking for $ac_word" >&5
+echo "$as_me:22610: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22609,8 +22624,16 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:22612: found $ac_dir/$ac_word" >&5
+   echo "$as_me:22627: found $ac_dir/$ac_word" >&5
    break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_path_GMSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+      echo "$as_me:22633: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
 fi
 done
 
@@ -22621,16 +22644,16 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:22624: result: $GMSGFMT" >&5
+  echo "$as_me:22647: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:22627: result: no" >&5
+  echo "$as_me:22650: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:22633: checking for $ac_word" >&5
+echo "$as_me:22656: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22657,15 +22680,15 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
-  echo "$as_me:22660: result: $XGETTEXT" >&5
+  echo "$as_me:22683: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:22663: result: no" >&5
+  echo "$as_me:22686: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22668 "configure"
+#line 22691 "configure"
 #include "confdefs.h"
 
 int
@@ -22678,16 +22701,16 @@ extern int _nl_msg_cat_cntr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22684: \$? = $ac_status" >&5
+  echo "$as_me:22707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22690: \$? = $ac_status" >&5
+  echo "$as_me:22713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -22705,7 +22728,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
 fi
 
         if test "$CATOBJEXT" = "NONE"; then
-	  echo "$as_me:22708: checking whether catgets can be used" >&5
+	  echo "$as_me:22731: checking whether catgets can be used" >&5
 echo $ECHO_N "checking whether catgets can be used... $ECHO_C" >&6
 
 # Check whether --with-catgets or --without-catgets was given.
@@ -22715,12 +22738,12 @@ if test "${with_catgets+set}" = set; the
 else
   nls_cv_use_catgets=no
 fi;
-	  echo "$as_me:22718: result: $nls_cv_use_catgets" >&5
+	  echo "$as_me:22741: result: $nls_cv_use_catgets" >&5
 echo "${ECHO_T}$nls_cv_use_catgets" >&6
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 
-echo "$as_me:22723: checking for main in -li" >&5
+echo "$as_me:22746: checking for main in -li" >&5
 echo $ECHO_N "checking for main in -li... $ECHO_C" >&6
 if test "${ac_cv_lib_i_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22728,7 +22751,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-li  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22731 "configure"
+#line 22754 "configure"
 #include "confdefs.h"
 
 int
@@ -22740,16 +22763,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22746: \$? = $ac_status" >&5
+  echo "$as_me:22769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22752: \$? = $ac_status" >&5
+  echo "$as_me:22775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_i_main=yes
 else
@@ -22760,7 +22783,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22763: result: $ac_cv_lib_i_main" >&5
+echo "$as_me:22786: result: $ac_cv_lib_i_main" >&5
 echo "${ECHO_T}$ac_cv_lib_i_main" >&6
 if test $ac_cv_lib_i_main = yes; then
   cat >>confdefs.h <<EOF
@@ -22771,13 +22794,13 @@ EOF
 
 fi
 
-	    echo "$as_me:22774: checking for catgets" >&5
+	    echo "$as_me:22797: checking for catgets" >&5
 echo $ECHO_N "checking for catgets... $ECHO_C" >&6
 if test "${ac_cv_func_catgets+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22780 "configure"
+#line 22803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets (); below.  */
@@ -22808,16 +22831,16 @@ f = catgets;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22814: \$? = $ac_status" >&5
+  echo "$as_me:22837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22820: \$? = $ac_status" >&5
+  echo "$as_me:22843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_catgets=yes
 else
@@ -22827,7 +22850,7 @@ ac_cv_func_catgets=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22830: result: $ac_cv_func_catgets" >&5
+echo "$as_me:22853: result: $ac_cv_func_catgets" >&5
 echo "${ECHO_T}$ac_cv_func_catgets" >&6
 if test $ac_cv_func_catgets = yes; then
 
@@ -22838,7 +22861,7 @@ EOF
 	       INTLOBJS="\$(CATOBJS)"
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
-echo "$as_me:22841: checking for $ac_word" >&5
+echo "$as_me:22864: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GENCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22855,8 +22878,16 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GENCAT="$ac_dir/$ac_word"
-   echo "$as_me:22858: found $ac_dir/$ac_word" >&5
+   echo "$as_me:22881: found $ac_dir/$ac_word" >&5
    break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_path_GENCAT="$ac_dir/$ac_word$ac_exec_ext"
+      echo "$as_me:22887: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
 fi
 done
 
@@ -22867,16 +22898,16 @@ fi
 GENCAT=$ac_cv_path_GENCAT
 
 if test -n "$GENCAT"; then
-  echo "$as_me:22870: result: $GENCAT" >&5
+  echo "$as_me:22901: result: $GENCAT" >&5
 echo "${ECHO_T}$GENCAT" >&6
 else
-  echo "$as_me:22873: result: no" >&5
+  echo "$as_me:22904: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 	       if test "$GENCAT" != "no"; then
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:22879: checking for $ac_word" >&5
+echo "$as_me:22910: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22893,8 +22924,16 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:22896: found $ac_dir/$ac_word" >&5
+   echo "$as_me:22927: found $ac_dir/$ac_word" >&5
    break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_path_GMSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+      echo "$as_me:22933: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
 fi
 done
 
@@ -22905,17 +22944,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:22908: result: $GMSGFMT" >&5
+  echo "$as_me:22947: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:22911: result: no" >&5
+  echo "$as_me:22950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		 if test "$GMSGFMT" = "no"; then
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:22918: checking for $ac_word" >&5
+echo "$as_me:22957: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22942,17 +22981,17 @@ esac
 fi
 GMSGFMT="$ac_cv_path_GMSGFMT"
 if test -n "$GMSGFMT"; then
-  echo "$as_me:22945: result: $GMSGFMT" >&5
+  echo "$as_me:22984: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:22948: result: no" >&5
+  echo "$as_me:22987: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 		 fi
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:22955: checking for $ac_word" >&5
+echo "$as_me:22994: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22979,10 +23018,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
-  echo "$as_me:22982: result: $XGETTEXT" >&5
+  echo "$as_me:23021: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:22985: result: no" >&5
+  echo "$as_me:23024: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23010,7 +23049,7 @@ fi
                 INTLOBJS="\$(GETTOBJS)"
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:23013: checking for $ac_word" >&5
+echo "$as_me:23052: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23037,16 +23076,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
-  echo "$as_me:23040: result: $MSGFMT" >&5
+  echo "$as_me:23079: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:23043: result: no" >&5
+  echo "$as_me:23082: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:23049: checking for $ac_word" >&5
+echo "$as_me:23088: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23063,8 +23102,16 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:23066: found $ac_dir/$ac_word" >&5
+   echo "$as_me:23105: found $ac_dir/$ac_word" >&5
    break
+elif test -n "$ac_executable_extensions"; then
+  for ac_exec_ext in $ac_executable_extensions; do
+    if $as_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+      ac_cv_path_GMSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+      echo "$as_me:23111: found $ac_dir/$ac_word$ac_exec_ext" >&5
+      break 2
+    fi
+  done
 fi
 done
 
@@ -23075,16 +23122,16 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:23078: result: $GMSGFMT" >&5
+  echo "$as_me:23125: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:23081: result: no" >&5
+  echo "$as_me:23128: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:23087: checking for $ac_word" >&5
+echo "$as_me:23134: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23111,10 +23158,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
-  echo "$as_me:23114: result: $XGETTEXT" >&5
+  echo "$as_me:23161: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:23117: result: no" >&5
+  echo "$as_me:23164: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23133,7 +23180,7 @@ fi
 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 	  : ;
 	else
-	  echo "$as_me:23136: result: found xgettext program is not GNU xgettext; ignore it" >&5
+	  echo "$as_me:23183: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 	  XGETTEXT=":"
 	fi
@@ -23152,7 +23199,7 @@ echo "${ECHO_T}found xgettext program is
     fi
     ac_config_links="$ac_config_links $nls_cv_header_intl:$nls_cv_header_libgt"
 
-    ac_config_commands="$ac_config_commands default-3"
+    ac_config_commands="$ac_config_commands default-2"
 
     # If this is used in GNU gettext we have to set USE_NLS to `yes'
     # because some of the sources are only built for this goal.
@@ -23170,7 +23217,7 @@ echo "${ECHO_T}found xgettext program is
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:23173: checking for catalogs to be installed" >&5
+       echo "$as_me:23220: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
@@ -23179,7 +23226,7 @@ echo $ECHO_N "checking for catalogs to b
          esac
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:23182: result: $LINGUAS" >&5
+       echo "$as_me:23229: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -23197,23 +23244,23 @@ echo "${ECHO_T}$LINGUAS" >&6
 
             test -d intl || mkdir intl
    if test "$CATOBJEXT" = ".cat"; then
-     echo "$as_me:23200: checking for linux/version.h" >&5
+     echo "$as_me:23247: checking for linux/version.h" >&5
 echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6
 if test "${ac_cv_header_linux_version_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23206 "configure"
+#line 23253 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 _ACEOF
-if { (eval echo "$as_me:23210: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23257: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23216: \$? = $ac_status" >&5
+  echo "$as_me:23263: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23232,7 +23279,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23235: result: $ac_cv_header_linux_version_h" >&5
+echo "$as_me:23282: result: $ac_cv_header_linux_version_h" >&5
 echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6
 if test $ac_cv_header_linux_version_h = yes; then
   msgformat=linux
@@ -23243,7 +23290,7 @@ fi
                sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
    fi
       sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+     $srcdir/intl/po2tbl-sed.in > intl/po2tbl.sed
 
             if test "$PACKAGE" = "gettext"; then
      GT_NO="#NO#"
@@ -23360,7 +23407,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:23363: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23410: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -23445,19 +23492,27 @@ _ACEOF
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+  cat >>$CONFIG_STATUS <<EOF
+config_files='$ac_config_files'
+EOF
 fi
 
 if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+  cat >>$CONFIG_STATUS <<EOF
+config_headers='$ac_config_headers'
+EOF
 fi
 
 if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+  cat >>$CONFIG_STATUS <<EOF
+config_links='$ac_config_links'
+EOF
 fi
 
 if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+  cat >>$CONFIG_STATUS <<EOF
+config_commands='$ac_config_commands'
+EOF
 fi
 
 cat >>$CONFIG_STATUS <<\EOF
@@ -23495,14 +23550,15 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.49e,
-  with options \"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\"
+configured by $0, generated by GNU Autoconf 2.50,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+srcdir='$srcdir'
 INSTALL="$INSTALL"
 EOF
 
@@ -23539,7 +23595,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:23542: error: ambiguous option: $1
+    { { echo "$as_me:23598: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -23586,16 +23642,15 @@ Try \`$0 --help' for more information." 
   '$nls_cv_header_intl' ) CONFIG_LINKS="$CONFIG_LINKS $nls_cv_header_intl:$nls_cv_header_libgt" ;;
   'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   'default-2' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
-  'default-3' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-3" ;;
-  'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.h-in" ;;
 
   # This is an error.
-  -*) { { echo "$as_me:23593: error: unrecognized option: $1
+  -*) { { echo "$as_me:23648: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
-  *) { { echo "$as_me:23598: error: invalid argument: $1" >&5
+  *) { { echo "$as_me:23653: error: invalid argument: $1" >&5
 echo "$as_me: error: invalid argument: $1" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -23609,7 +23664,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.49e, executed with
+This file was extended by $as_me 2.50, executed with
   > $ac_cs_invocation
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -23657,16 +23712,7 @@ cat >>$CONFIG_STATUS <<EOF
 # INIT-COMMANDS section.
 #
 
-am_indx=1
-  for am_file in config.h; do
-    case " $CONFIG_HEADERS " in
-    *" $am_file "*)
-      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
-      ;;
-    esac
-    am_indx=\`expr \$am_indx + 1\`
-  done
-AMDEP="$AMDEP"
+AMDEP_TRUE="$AMDEP_TRUE"
 ac_aux_dir="$ac_aux_dir"
 
 EOF
@@ -23723,6 +23769,8 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@VERSION@,$VERSION,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
 s,@ACLOCAL@,$ACLOCAL,;t t
 s,@AUTOCONF@,$AUTOCONF,;t t
 s,@AUTOMAKE@,$AUTOMAKE,;t t
@@ -23730,25 +23778,23 @@ s,@AUTOHEADER@,$AUTOHEADER,;t t
 s,@MAKEINFO@,$MAKEINFO,;t t
 s,@AMTAR@,$AMTAR,;t t
 s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@INSTALL_STRIP_PROGRAM_ENV@,$INSTALL_STRIP_PROGRAM_ENV,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
-s,@AMDEP@,$AMDEP,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@DEPDIR@,$DEPDIR,;t t
 s,@PERL@,$PERL,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
 s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@_am_include@,$_am_include,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@CPP@,$CPP,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@GNU_PACKAGE@,$GNU_PACKAGE,;t t
@@ -23840,6 +23886,18 @@ fi # test -n "$CONFIG_FILES"
 EOF
 cat >>$CONFIG_STATUS <<\EOF
 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  if test -d /dev/env/DJDIR -a -n "$DJGPP" -a -f "$DJGPP"; then
+    # Special rule for DOS paths. In order to prevent confusion between the
+    # drivespec and the delimiter, we make it a /dev/-style path.
+    # The -E is needed to prevent echo from expanding backslash escapes.
+    case $ac_file in
+      ?:[\\/]* )
+	ac_file=`echo -E "$ac_file" |tr '\\\\' '/' \
+		 |sed 's,^\(.\):\([\\/].*:\),/dev/\1\2,' \
+                 |sed 's,:\(.\):[\\/],:/dev/\1/,'`;;
+    esac
+  fi
+
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
@@ -23894,7 +23952,16 @@ done; }
       else
          ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
       fi ;;
-  [\\/]* | ?:[\\/]* )
+  [\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
+  ?:[\\/]* )
+      if test -d /dev/env/DJDIR -a -n "$DJGPP" -a -f "$DJGPP"; then
+	# This takes out the colon, so the loop for ac_file_inputs still works
+	# on DOS (IFS = ':'!)
+	# The -E is needed to prevent echo from expanding backslash escapes.
+	srcdir=`echo -E $srcdir |tr '\\\\' '/' |sed 's,^\(.\):[\\/],/dev/\1/,'`;
+      fi
       ac_srcdir=$srcdir$ac_dir_suffix;
       ac_top_srcdir=$srcdir ;;
   *) # Relative path.
@@ -23908,7 +23975,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:23911: creating $ac_file" >&5
+    { echo "$as_me:23978: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -23926,7 +23993,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:23929: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:23996: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -23939,7 +24006,7 @@ echo "$as_me: error: cannot find input f
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:23942: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24009: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -23989,6 +24056,17 @@ ac_uC=' '
 ac_uD=',;t'
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+  if test -d /dev/env/DJDIR -a -n "$DJGPP" -a -f "$DJGPP"; then
+    # Special rule for DOS paths. In order to prevent confusion between the
+    # drivespec and the delimiter, we make it a /dev/-style path.
+    case $ac_file in
+      ?:[\\/]* )
+	ac_file_in=`echo "$ac_file" |tr '\\' '/' \
+                    |sed 's,^\(.\):\([\\/].*:\),/dev/\1\2,' \
+                    |sed 's,:\(.\):[\\/],:/dev/\1/,'`;;
+    esac
+  fi
+
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
@@ -24000,7 +24078,7 @@ for ac_file in : $CONFIG_HEADERS; do tes
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24003: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24081: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24011,7 +24089,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24014: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24092: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24024,7 +24102,7 @@ echo "$as_me: error: cannot find input f
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:24027: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24105: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24141,7 +24219,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:24144: $ac_file is unchanged" >&5
+      { echo "$as_me:24222: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -24180,6 +24258,12 @@ done; }
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
+  # Run the commands associated with the file.
+  case $ac_file in
+    config.h ) # update the timestamp
+echo timestamp >"./stamp-h1"
+ ;;
+  esac
 done
 EOF
 cat >>$CONFIG_STATUS <<\EOF
@@ -24192,11 +24276,11 @@ for ac_file in : $CONFIG_LINKS; do test 
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
-  { echo "$as_me:24195: linking $srcdir/$ac_source to $ac_dest" >&5
+  { echo "$as_me:24279: linking $srcdir/$ac_source to $ac_dest" >&5
 echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
 
   if test ! -r $srcdir/$ac_source; then
-    { { echo "$as_me:24199: error: $srcdir/$ac_source: File not found" >&5
+    { { echo "$as_me:24283: error: $srcdir/$ac_source: File not found" >&5
 echo "$as_me: error: $srcdir/$ac_source: File not found" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -24244,11 +24328,18 @@ done; }
   esac
 
   # Make a symlink if possible; otherwise try a hard link.
-  ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+  if test "$as_ln_s" = "ln -s"; then
+    ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+      ln $srcdir/$ac_source $ac_dest ||
+        { { echo "$as_me:24334: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
+echo "$as_me: error: cannot link $ac_dest to $srcdir/$ac_source" >&2;}
+   { (exit 1); exit 1; }; }
+  else
     ln $srcdir/$ac_source $ac_dest ||
-    { { echo "$as_me:24249: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
+      { { echo "$as_me:24339: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
 echo "$as_me: error: cannot link $ac_dest to $srcdir/$ac_source" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 done
 EOF
 cat >>$CONFIG_STATUS <<\EOF
@@ -24261,9 +24352,8 @@ for ac_file in : $CONFIG_COMMANDS; do te
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   case $ac_dest in
-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp >	   stamp-h ;;
-    default-2 )
-test x"$AMDEP" != x"" ||
+    default-1 )
+test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
   Makefile) dirpart=.;;
@@ -24301,7 +24391,7 @@ for mf in $CONFIG_FILES; do
   done
 done
  ;;
-    default-3 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+    default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac ;;
   esac
--- /dev/c/develop/ports/orig/fileutils-4.1/Makefile.am	2000-11-17 10:17:46.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/Makefile.am	2002-06-11 13:51:36.000000000 +0000
@@ -2,8 +2,8 @@
 AUTOMAKE_OPTIONS = gnits 1.2h
 
 SUBDIRS = lib intl src doc man m4 po tests
-EXTRA_DIST = Makefile.maint GNUmakefile ChangeLog-1997 \
-  .kludge-stamp .prev-version
+EXTRA_DIST = Makefile.maint GNUmakefile ChangeLog.97 \
+  _kludge-stamp _prev-version
 
 # Remove this file here (it is created via configure), not from within intl.
 DISTCLEANFILES = intl/libintl.h
--- /dev/c/develop/ports/orig/fileutils-4.1/Makefile.in	2001-04-29 08:25:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/Makefile.in	2002-06-11 14:19:22.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,22 +104,21 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = gnits 1.2h
 
 SUBDIRS = lib intl src doc man m4 po tests
-EXTRA_DIST = Makefile.maint GNUmakefile ChangeLog-1997 \
-  .kludge-stamp .prev-version
+EXTRA_DIST = Makefile.maint GNUmakefile ChangeLog.97 \
+  _kludge-stamp _prev-version
 
 
 # Remove this file here (it is created via configure), not from within intl.
@@ -131,6 +126,7 @@ DISTCLEANFILES = intl/libintl.h
 
 ACLOCAL_AMFLAGS = -I m4
 
+
 # Just prior to distribution, ...
 # transform the automake-generated rule that runs `rm -f rm'.
 # On some systems, that command would fail with a diagnostic like
@@ -138,78 +134,57 @@ ACLOCAL_AMFLAGS = -I m4
 # in the shell's search path that running `rm' would run the `rm'
 # executable in the current directory.
 # Similarly, adjust the clean-binPROGRAMS rule.
-
 rm_subst = \
   s!(rm -f (rm|\$$\(bin_PROGRAMS\)))$$!$$1 > /dev/null 2>&1 || /bin/$$1!
 
-EXEEXT =
-OBJEXT = o
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = intl/Makefile
 DIST_SOURCES =
-DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-INSTALL Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 \
-config.guess config.h.in config.sub configure configure.in depcomp \
-install-sh missing mkinstalldirs
 
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL Makefile.am Makefile.in NEWS THANKS TODO aclocal.m4 \
+	config.guess config.h-in config.sub configure configure.in \
+	depcomp install-sh missing mkinstalldirs
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$@ $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.in m4/afs.m4 m4/assert.m4 m4/bison.m4 \
-		m4/c-bs-a.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 \
-		m4/d-ino.m4 m4/d-type.m4 m4/dos.m4 m4/error.m4 \
-		m4/fnmatch.m4 m4/fpending.m4 m4/fstypename.m4 \
-		m4/fsusage.m4 m4/ftruncate.m4 m4/getgroups.m4 \
-		m4/getline.m4 m4/getloadavg.m4 m4/glibc.m4 \
-		m4/glibc21.m4 m4/gnu-source.m4 m4/group-member.m4 \
-		m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 \
-		m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 \
-		m4/jm-winsz1.m4 m4/jm-winsz2.m4 m4/lchown.m4 \
-		m4/lcmessage.m4 m4/lib-check.m4 m4/libintl.m4 \
-		m4/link-follow.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 \
-		m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 \
-		m4/mbswidth.m4 m4/memcmp.m4 m4/nanosleep.m4 m4/perl.m4 \
-		m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/readdir.m4 \
-		m4/realloc.m4 m4/regex.m4 m4/rename.m4 \
-		m4/rmdir-errno.m4 m4/search-libs.m4 m4/st_dm_mode.m4 \
-		m4/st_mtim.m4 m4/stat.m4 m4/strerror_r.m4 \
-		m4/strftime.m4 m4/timespec.m4 m4/uintmax_t.m4 \
-		m4/ulonglong.m4 m4/unlink-busy.m4 m4/uptime.m4 \
-		m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/xstrtoumax.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
+$(ACLOCAL_M4):  configure.in m4/afs.m4 m4/assert.m4 m4/bison.m4 m4/c-bs-a.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 m4/d-ino.m4 m4/d-type.m4 m4/dos.m4 m4/error.m4 m4/fnmatch.m4 m4/fpending.m4 m4/fstypename.m4 m4/fsusage.m4 m4/ftruncate.m4 m4/getgroups.m4 m4/getline.m4 m4/getloadavg.m4 m4/glibc.m4 m4/glibc21.m4 m4/gnu-source.m4 m4/group-member.m4 m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 m4/jm-wnsz1.m4 m4/jm-wnsz2.m4 m4/lchown.m4 m4/lcmessage.m4 m4/lib-check.m4 m4/libintl.m4 m4/link-follow.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/memcmp.m4 m4/nanosleep.m4 m4/perl.m4 m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/readdir.m4 m4/realloc.m4 m4/regex.m4 m4/rename.m4 m4/rmdir-errno.m4 m4/search-libs.m4 m4/st_dm_mode.m4 m4/st_mtim.m4 m4/stat.m4 m4/strerror_r.m4 m4/strftime.m4 m4/timespec.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unlink-busy.m4 m4/uptime.m4 m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/xstrtoumax.m4
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
 		rm -f stamp-h; \
 		$(MAKE) stamp-h; \
 	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h stamp-hT
-	@echo timestamp > stamp-hT 2> /dev/null
+stamp-h: $(srcdir)/config.h-in $(top_builddir)/config.status
+	@rm -f stamp-h stamp-h.T
+	@echo timestamp > stamp-h.T 2> /dev/null
 	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.h-in \
 	     $(SHELL) ./config.status
-	@mv stamp-hT stamp-h
-$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
+	@mv stamp-h.T stamp-h
+$(srcdir)/config.h-in:  $(srcdir)/./stamp-h.in
 	@if test ! -f $@; then \
 		rm -f $(srcdir)/./stamp-h.in; \
 		$(MAKE) $(srcdir)/./stamp-h.in; \
@@ -224,6 +199,7 @@ distclean-hdr:
 	-rm -f config.h
 intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -231,10 +207,7 @@ intl/Makefile: $(top_builddir)/config.st
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -294,14 +267,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h-in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -309,26 +282,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
+	test -z "$(ETAGS_ARGS)config.h-in$$unique$(LISP)$$tags" \
+	  || etags $(ETAGS_ARGS) $$tags config.h-in $$unique $(LISP)
 
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = .
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+# Avoid unsightly `./'.
+distdir = $(PACKAGE)-$(VERSION)
 
 GZIP_ENV = --best
 
 distdir: $(DISTFILES)
-	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; then :; else \
+	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
+	then :; else \
 	  echo "NEWS not updated; not releasing" 1>&2; \
 	  exit 1; \
 	fi
@@ -336,7 +311,11 @@ distdir: $(DISTFILES)
 	mkdir $(distdir)
 	$(mkinstalldirs) $(distdir)/intl $(distdir)/po
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -367,6 +346,7 @@ distdir: $(DISTFILES)
 dist: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -388,7 +368,9 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	     || (echo "Error: files left after uninstall" 1>&2; \
+	         exit 1) ) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
 	  && rm -f $(distdir).tar.gz \
@@ -401,7 +383,6 @@ distcheck: dist
 check-am: all-am
 check: check-recursive
 all-am: Makefile config.h
-
 installdirs: installdirs-recursive
 installdirs-am:
 
@@ -414,40 +395,37 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
 
-dist-all: dist
-
+dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 distclean: distclean-recursive
-	-rm -f config.status
-
+	-rm -f config.status config.cache config.log
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
 
-dvi:
+dvi: dvi-recursive
 
 dvi-am:
 
-info:
+info: info-recursive
 
 info-am:
 
@@ -455,14 +433,13 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-recursive
 
 install-man:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -470,20 +447,24 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-.PHONY: all all-am all-recursive check check-am check-recursive clean \
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
 	clean-generic clean-recursive dist dist-all distcheck distclean \
 	distclean-generic distclean-hdr distclean-recursive \
 	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
 	info-recursive install install-am install-data install-data-am \
 	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-recursive \
-	install-man install-recursive install-strip installcheck \
-	installcheck-am installcheck-recursive installdirs \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
 	installdirs-am installdirs-recursive maintainer-clean \
 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
 	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-recursive \
-	uninstall-recursive
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
 
 
 # Some tests always need root privileges, others need them only sometimes.
@@ -495,7 +476,6 @@ distcheck-hook:
 .kludge-stamp: $(srcdir)/src/Makefile.in
 	perl -pi -e '$(rm_subst)' $(srcdir)/src/Makefile.in
 	touch $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/Makefile.maint	2001-04-25 12:30:48.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/Makefile.maint	2002-06-11 13:41:42.000000000 +0000
@@ -11,7 +11,7 @@ maintainer-check:
 	$(MAKE) distcheck
 	$(MAKE) my-distcheck
 
-prev_version_file = .prev-version
+prev_version_file = _prev-version
 
 THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
 PREV_VERSION := $(shell cat $(prev_version_file))
--- /dev/c/develop/ports/orig/fileutils-4.1/aclocal.m4	2001-04-29 08:25:34.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/aclocal.m4	2002-06-11 14:19:02.000000000 +0000
@@ -1,6 +1,6 @@
-# aclocal.m4 generated automatically by aclocal 1.4e
+# aclocal.m4 generated automatically by aclocal 1.5
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -23,22 +23,60 @@
 AC_PREREQ([2.12])
 
 AC_DEFUN([AM_CONFIG_HEADER],
+[ifdef([AC_FOREACH],dnl
+	 [dnl init our file count if it isn't already
+	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
+	 dnl prepare to store our destination file list for use in config.status
+	 AC_FOREACH([_AM_File], [$1],
+		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
+		    dnl and add it to the list of files AC keeps track of, along
+		    dnl with our hook
+		    AC_CONFIG_HEADERS(_AM_File,
+dnl COMMANDS, [, INIT-CMDS]
+[# update the timestamp
+echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
+][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
+		    m4_popdef([_AM_Dest])])],dnl
 [AC_CONFIG_HEADER([$1])
   AC_OUTPUT_COMMANDS(
    ifelse(patsubst([$1], [[^ ]], []),
 	  [],
 	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
-	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
-  [am_indx=1
-  for am_file in $1; do
-    case " $CONFIG_HEADERS " in
-    *" $am_file "*)
-      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
-      ;;
-    esac
-    am_indx=\`expr \$am_indx + 1\`
-  done])
-])
+	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
+[am_indx=1
+for am_file in $1; do
+  case " \$CONFIG_HEADERS " in
+  *" \$am_file "*)
+    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
+    if test -n "\$am_dir"; then
+      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
+      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
+        am_tmpdir=\$am_tmpdir\$am_subdir/
+        if test ! -d \$am_tmpdir; then
+          mkdir \$am_tmpdir
+        fi
+      done
+    fi
+    echo timestamp > "\$am_dir"stamp-h\$am_indx
+    ;;
+  esac
+  am_indx=\`expr \$am_indx + 1\`
+done])
+])]) # AM_CONFIG_HEADER
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(m4_regexp([$1], [^/.*]), -1,
+			  [.],
+			  m4_patsubst([$1], [^\(/\).*], [\1])),
+		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+]) # _AM_DIRNAME
 
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
@@ -74,8 +112,23 @@ ifdef([AC_PROVIDE_IFELSE],
 # ----------------------------------------------
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])dnl
+# Autoconf 2.50 computes the path separator for us; 2.13 doesn't
+if test x$ac_path_separator = x; then
+  echo "#! $SHELL" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) 2>/dev/null; then
+    ac_path_separator=';'
+  else
+    ac_path_separator=:
+  fi
+  PATH_SEPARATOR=$ac_path_separator
+  AC_SUBST([PATH_SEPARATOR])
+  rm -f conftest.sh
+fi
+
 # test to see if srcdir already configured
-if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+if test "`CDPATH=$ac_path_separator; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
 fi
@@ -92,7 +145,16 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", 
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 ifdef([m4_pattern_allow],
-      [m4_pattern_allow([^AM_(C|CPP|CXX|OBJC|F|R|GCJ)FLAGS])])dnl
+      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
+
+# Autoconf 2.50 always computes EXEEXT.  However we need to be
+# compatible with 2.13, for now.  So we always define EXEEXT, but we
+# don't compute it.
+AC_SUBST(EXEEXT)
+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
+# requests that it be used.  This is a bit dumb.
+: ${OBJEXT=o}
+AC_SUBST(OBJEXT)
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
@@ -103,7 +165,7 @@ AM_MISSING_PROG(AUTOMAKE, automake)
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)
-AM_MISSING_INSTALL_SH
+AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -112,13 +174,13 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_PROVIDE_IFELSE([AC_PROG_][CC],
-                  [AM_DEPENDENCIES(CC)],
+                  [_AM_DEPENDENCIES(CC)],
                   [define([AC_PROG_][CC],
-                          defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl
+                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [AM_DEPENDENCIES(CXX)],
+                  [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl
+                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
 
 #
@@ -145,6 +207,7 @@ if (
       # -L didn't work.
       set X `ls -t $srcdir/configure conftest.file`
    fi
+   rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
       && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
@@ -165,7 +228,6 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-rm -f conftest*
 AC_MSG_RESULT(yes)])
 
 
@@ -179,34 +241,15 @@ $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
 
-# AM_MISSING_INSTALL_SH
-# ---------------------
-# Like AM_MISSING_PROG, but only looks for install-sh.
-AC_DEFUN([AM_MISSING_INSTALL_SH],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-if test -z "$install_sh"; then
-   for install_sh in "$ac_aux_dir/install-sh" \
-                     "$ac_aux_dir/install.sh" \
-                     "${am_missing_run}${ac_auxdir}/install-sh";
-   do
-     test -f "$install_sh" && break
-   done
-   # FIXME: an evil hack: we remove the SHELL invocation from
-   # install_sh because automake adds it back in.  Sigh.
-   install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
-fi
-AC_SUBST(install_sh)])
-
-
 # AM_MISSING_HAS_RUN
 # ------------------
 # Define MISSING if not defined so far and test if it supports --run.
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
-[test x"${MISSING+set}" = xset ||
-  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
-if eval "$MISSING --run :"; then
+if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
@@ -218,80 +261,71 @@ fi
 # AM_AUX_DIR_EXPAND
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to ${srcdir}/foo.  In other projects, it is set to `.'.
-# Of course, Automake must honor this variable whenever it call a tool
-# from the auxiliary directory.  The problem is that $srcdir (hence
-# $ac_aux_dir) can be either an absolute path or a path relative to
-# $top_srcdir or absolute, this depends on how configure is run.  This
-# is pretty anoying since it makes $ac_aux_dir quite unusable in
-# subdirectories: on the top source directory, any form will work
-# fine, but in subdirectories relative pat needs to be adapted.
-# - calling $top_srcidr/$ac_aux_dir/missing would success if $srcdir is
-#   relative, but fail if $srcdir is absolute
-# - conversly, calling $ax_aux_dir/missing would fail if $srcdir is
-#   absolute, and success on relative paths.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
 #
-# Consequently, we define and use $am_aux_dir, the "always absolute"
-# version of $ac_aux_dir.
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND], [
 # expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+am_aux_dir=`CDPATH="$ac_path_separator"; cd $ac_aux_dir && pwd`
 ])
 
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
-# annoying in cross=compiling environments, where the build's strip
+# annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so if we ever
-# need to use a non standard strip, we just have to make sure we use
-# install-sh with the STRIPPROG variable set.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_MISSING_INSTALL_SH])
-dnl Don't test for $cross_compiling = yes, it might be `maybe'...
-# We'd like to do this but we can't because it will unconditionally
-# require config.guess.  One way would be if autoconf had the capability
-# to let us compile in this code only when config.guess was already
-# a possibility.
-#if test "$cross_compiling" != no; then
-#  # since we are cross-compiling, we need to check for a suitable `strip'
-#  AM_PROG_STRIP
-#  if test -z "$STRIP"; then
-#    AC_MSG_WARN([strip missing, install-strip will not strip binaries])
-#  fi
-#fi
-
-# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
-# instruct install-strip to use install-sh and the given $STRIP program.
-# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
-# as much as possible, because it's faster.
-if test -z "$STRIP"; then
-  # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-  # and the double dolard below is there to make sure that ${INSTALL}
-  # is substitued in the sub-makes, not at the top-level; this is
-  # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-  # by config.status).
-  INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-  INSTALL_STRIP_PROGRAM_ENV=''
-else
-  _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
-  INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-  INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
-fi
-AC_SUBST([STRIP])
-AC_SUBST([INSTALL_STRIP_PROGRAM])
-AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
-
-#AC_DEFUN([AM_PROG_STRIP],
-#[# Check for `strip', unless the installer
-# has set the STRIP environment variable.
-# Note: don't explicitly check for -z "$STRIP" here because
-# that will cause problems if AC_CANONICAL_* is AC_REQUIREd after
-# this macro, and anyway it doesn't have an effect anyway.
-#AC_CHECK_TOOL([STRIP],[strip])
-#])
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4						-*- Autoconf -*-
+
 
-# serial 3
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -299,53 +333,57 @@ AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
 # C support machinery.  Also note that it means that autoscan, seeing
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
-# AM_DEPENDENCIES(NAME)
+
+
+# _AM_DEPENDENCIES(NAME)
 # ---------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX" or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
-AC_DEFUN([AM_DEPENDENCIES],
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-ifelse([$1], CC,
-       [AC_REQUIRE([AC_PROG_][CC])dnl
-AC_REQUIRE([AC_PROG_][CPP])
-depcc="$CC"
-depcpp="$CPP"],
-       [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl
-AC_REQUIRE([AC_PROG_][CXXCPP])
-depcc="$CXX"
-depcpp="$CXXCPP"],
-       [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc],
-       [AC_REQUIRE([AC_PROG_][$1])dnl
-depcc="$$1"
-depcpp=""])
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
 
-AC_REQUIRE([AM_MAKE_INCLUDE])
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP"; then
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  mkdir confdir
+  mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
-  cp "$am_depcomp" confdir
-  cd confdir
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
 
   am_cv_$1_dependencies_compiler_type=none
-  for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
     echo '#include "conftest.h"' > conftest.c
     echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
-    case "$depmode" in
+    case $depmode in
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -360,18 +398,19 @@ AC_CACHE_CHECK([dependency style of $dep
     # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
-    if depmode="$depmode" \
+    if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type="$depmode"
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_$1_dependencies_compiler_type=$depmode
       break
     fi
   done
 
   cd ..
-  rm -rf confdir
+  rm -rf conftest.dir
 else
   am_cv_$1_dependencies_compiler_type=none
 fi
@@ -384,16 +423,17 @@ AC_SUBST([$1DEPMODE])
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
   DEPDIR=.deps
-  # We redirect because .deps might already exist and be populated.
-  # In this situation we don't want to see an error.
-  rmdir .deps > /dev/null 2>&1
 else
+  # MS-DOS does not allow filenames that begin with a dot.
   DEPDIR=_deps
 fi
+rmdir .deps 2>/dev/null
 AC_SUBST(DEPDIR)
 ])
 
@@ -404,22 +444,11 @@ AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" = xno; then
-  AMDEP="#"
-else
+if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
-  if test ! -f "$am_depcomp"; then
-    AMDEP="#"
-  else
-    AMDEP=
-  fi
-fi
-AC_SUBST(AMDEP)
-if test -z "$AMDEP"; then
   AMDEPBACKSLASH='\'
-else
-  AMDEPBACKSLASH=
 fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 pushdef([subst], defn([AC_SUBST]))
 subst(AMDEPBACKSLASH)
 popdef([subst])
@@ -436,7 +465,7 @@ popdef([subst])
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
 AC_OUTPUT_COMMANDS([
-test x"$AMDEP" != x"" ||
+test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
   Makefile) dirpart=.;;
@@ -473,7 +502,7 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
-], [AMDEP="$AMDEP"
+], [AMDEP_TRUE="$AMDEP_TRUE"
 ac_aux_dir="$ac_aux_dir"])])
 
 # AM_MAKE_INCLUDE()
@@ -481,26 +510,69 @@ ac_aux_dir="$ac_aux_dir"])])
 # Check to see how make treats includes.
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
-# BSD make uses .include
 cat > confinc << 'END'
 doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
-_am_include='#'
-for am_inc in include .include; do
-   echo "$am_inc confinc" > confmf
-   if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
-      _am_include=$am_inc
-      break
+am__include='#'
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote='"'
+      _am_result=BSD
    fi
-done
-AC_SUBST(_am_include)
-AC_MSG_RESULT($_am_include)
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
 rm -f confinc confmf
 ])
 
+# serial 3
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+#
+# FIXME: Once using 2.50, use this:
+# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],
+        [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+ifelse([$1], [FALSE],
+       [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
 #serial 3
 
 dnl From Jim Meyering.
@@ -4264,7 +4336,7 @@ strdup __argz_count __argz_stringify __a
    fi
    dnl po2tbl.sed is always needed.
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+     $srcdir/intl/po2tbl-sed.in > intl/po2tbl.sed
 
    dnl In the intl/Makefile.in we have a special dependency which makes
    dnl only sense for gettext.  We comment this out for non-gettext
--- /dev/c/develop/ports/orig/fileutils-4.1/doc/Makefile.in	2001-04-29 08:25:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/doc/Makefile.in	2002-06-11 14:19:22.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -97,9 +92,11 @@ MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -107,17 +104,16 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 info_TEXINFOS = fileutils.texi
 
 EXTRA_DIST = perm.texi getdate.texi
@@ -131,37 +127,30 @@ EXTRA_DIST = perm.texi getdate.texi
 # and those names all map to one 14-byte name (<package>.info-) on some crufty
 # old systems.
 MAKEINFO = makeinfo --no-split
-EXEEXT =
-OBJEXT = o
 subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-TEXI2DVI = texi2dvi
 INFO_DEPS = fileutils.info
 DVIS = fileutils.dvi
 TEXINFOS = fileutils.texi
 DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \
-version.texi
-
+	version.texi
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+.SUFFIXES: .dvi .info .ps .texi
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  doc/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  doc/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
-$(srcdir)/version.texi: $(srcdir)/stamp-vti
+$(srcdir)/version.texi:  $(srcdir)/stamp-vti
 	@:
-
 $(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
 	@(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/fileutils.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
@@ -186,24 +175,28 @@ fileutils.dvi: fileutils.texi $(srcdir)/
 .texi.info:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+	       `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+	TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+	$(TEXI2DVI) $<
 
 .texi:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+	       `echo $< | sed 's,.*/,,'`
+TEXI2DVI = texi2dvi
 DVIPS = dvips
 .dvi.ps:
 	$(DVIPS) $< -o $@
 
 uninstall-info-am:
 	$(PRE_UNINSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	@if (install-info --version && \
+	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
@@ -223,7 +216,7 @@ dist-info: $(INFO_DEPS)
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
 	  d=$(srcdir); \
-	  for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
+	  for file in `CDPATH="$(PATH_SEPARATOR)" && cd $$d && eval echo $$base*`; do \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file; \
 	  done; \
@@ -253,7 +246,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -282,23 +279,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -327,7 +321,7 @@ install-info-am: $(INFO_DEPS)
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
 	  d=$(srcdir); \
-	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	  for ifile in `CDPATH="$(PATH_SEPARATOR)" && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $$d/$$ifile; then \
 	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
 	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
@@ -335,7 +329,8 @@ install-info-am: $(INFO_DEPS)
 	  done; \
 	done
 	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	@if (install-info --version && \
+	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
@@ -357,8 +352,6 @@ mostlyclean-am: mostlyclean-aminfo mostl
 
 uninstall-am: uninstall-info-am
 
-uninstall-info: uninstall-info-am
-
 .PHONY: all all-am check check-am clean clean-generic dist-info \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
@@ -369,7 +362,6 @@ uninstall-info: uninstall-info-am
 	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti \
 	uninstall uninstall-am uninstall-info-am
 
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/doc/fileutils.info	2001-04-29 08:29:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/doc/fileutils.info	2002-06-11 13:41:44.000000000 +0000
@@ -3324,37 +3324,37 @@ Index
 * - and Unix rm:                         rm invocation.
 * -, removing files beginning with:      rm invocation.
 * --all <1>:                             du invocation.
-* --all <2>:                             df invocation.
-* --all:                                 Which files are listed.
+* --all <2>:                             Which files are listed.
+* --all:                                 df invocation.
 * --almost-all:                          Which files are listed.
 * --archive:                             cp invocation.
-* --backup <1>:                          ln invocation.
-* --backup <2>:                          mv invocation.
-* --backup <3>:                          install invocation.
-* --backup <4>:                          cp invocation.
-* --backup:                              Backup options.
+* --backup <1>:                          mv invocation.
+* --backup <2>:                          ln invocation.
+* --backup <3>:                          cp invocation.
+* --backup <4>:                          Backup options.
+* --backup:                              install invocation.
 * --block-size=SIZE:                     Block size.
 * --bourne-shell:                        dircolors invocation.
 * --bytes:                               du invocation.
 * --c-shell:                             dircolors invocation.
-* --changes <1>:                         chmod invocation.
-* --changes <2>:                         chgrp invocation.
-* --changes:                             chown invocation.
+* --changes <1>:                         chown invocation.
+* --changes <2>:                         chmod invocation.
+* --changes:                             chgrp invocation.
 * --classify:                            General output formatting.
 * --color:                               General output formatting.
 * --count-links:                         du invocation.
 * --csh:                                 dircolors invocation.
 * --date:                                touch invocation.
-* --dereference <1>:                     du invocation.
-* --dereference <2>:                     chgrp invocation.
-* --dereference <3>:                     chown invocation.
-* --dereference <4>:                     cp invocation.
-* --dereference:                         Which files are listed.
+* --dereference <1>:                     cp invocation.
+* --dereference <2>:                     Which files are listed.
+* --dereference <3>:                     chgrp invocation.
+* --dereference <4>:                     du invocation.
+* --dereference:                         chown invocation.
 * --dereference-args:                    du invocation.
-* --directory <1>:                       ln invocation.
+* --directory <1>:                       Which files are listed.
 * --directory <2>:                       rm invocation.
 * --directory <3>:                       install invocation.
-* --directory:                           Which files are listed.
+* --directory:                           ln invocation.
 * --dired:                               What information is listed.
 * --escape:                              Formatting the file names.
 * --exact:                               shred invocation.
@@ -3362,61 +3362,62 @@ Index
 * --exclude-type:                        df invocation.
 * --exclude=PAT:                         du invocation.
 * --file-type:                           General output formatting.
-* --force <1>:                           ln invocation.
-* --force <2>:                           shred invocation.
+* --force <1>:                           mv invocation.
+* --force <2>:                           cp invocation.
 * --force <3>:                           rm invocation.
-* --force <4>:                           mv invocation.
-* --force:                               cp invocation.
+* --force <4>:                           shred invocation.
+* --force:                               ln invocation.
 * --format <1>:                          General output formatting.
-* --format:                              What information is listed.
+* --format <2>:                          What information is listed.
+* --format:                              General output formatting.
 * --from:                                chown invocation.
 * --full-time:                           General output formatting.
 * --group:                               install invocation.
 * --help:                                Common options.
 * --hide-control-chars:                  Formatting the file names.
-* --human-readable <1>:                  du invocation.
-* --human-readable <2>:                  df invocation.
+* --human-readable <1>:                  Block size.
+* --human-readable <2>:                  du invocation.
 * --human-readable <3>:                  What information is listed.
-* --human-readable:                      Block size.
+* --human-readable:                      df invocation.
 * --ignore-backups:                      Which files are listed.
 * --ignore-fail-on-non-empty:            rmdir invocation.
 * --ignore=PATTERN:                      Which files are listed.
 * --indicator-style:                     General output formatting.
 * --inode:                               What information is listed.
 * --inodes:                              df invocation.
-* --interactive <1>:                     ln invocation.
+* --interactive <1>:                     mv invocation.
 * --interactive <2>:                     rm invocation.
-* --interactive <3>:                     mv invocation.
+* --interactive <3>:                     ln invocation.
 * --interactive:                         cp invocation.
 * --iterations=NUMBER:                   shred invocation.
-* --kilobytes <1>:                       du invocation.
-* --kilobytes <2>:                       df invocation.
-* --kilobytes <3>:                       General output formatting.
-* --kilobytes:                           Block size.
+* --kilobytes <1>:                       df invocation.
+* --kilobytes <2>:                       Block size.
+* --kilobytes <3>:                       du invocation.
+* --kilobytes:                           General output formatting.
 * --link:                                cp invocation.
 * --literal:                             Formatting the file names.
 * --local:                               df invocation.
 * --max-depth=DEPTH:                     du invocation.
 * --megabytes <1>:                       du invocation.
 * --megabytes:                           df invocation.
-* --mode <1>:                            mknod invocation.
-* --mode <2>:                            mkfifo invocation.
-* --mode <3>:                            mkdir invocation.
-* --mode:                                install invocation.
+* --mode <1>:                            install invocation.
+* --mode <2>:                            mkdir invocation.
+* --mode <3>:                            mkfifo invocation.
+* --mode:                                mknod invocation.
 * --no-create:                           touch invocation.
-* --no-dereference <1>:                  chgrp invocation.
+* --no-dereference <1>:                  cp invocation.
 * --no-dereference <2>:                  chown invocation.
-* --no-dereference <3>:                  ln invocation.
-* --no-dereference:                      cp invocation.
+* --no-dereference <3>:                  chgrp invocation.
+* --no-dereference:                      ln invocation.
 * --no-group:                            What information is listed.
 * --no-sync:                             df invocation.
 * --numeric-uid-gid:                     General output formatting.
-* --one-file-system <1>:                 du invocation.
-* --one-file-system:                     cp invocation.
+* --one-file-system <1>:                 cp invocation.
+* --one-file-system:                     du invocation.
 * --owner:                               install invocation.
-* --parents <1>:                         rmdir invocation.
-* --parents <2>:                         mkdir invocation.
-* --parents:                             cp invocation.
+* --parents <1>:                         mkdir invocation.
+* --parents <2>:                         cp invocation.
+* --parents:                             rmdir invocation.
 * --portability:                         df invocation.
 * --preserve:                            cp invocation.
 * --preserve-timestamps:                 install invocation.
@@ -3427,227 +3428,229 @@ Index
 * --quiet:                               chown invocation.
 * --quote-name:                          Formatting the file names.
 * --quoting-style:                       Formatting the file names.
-* --recursive <1>:                       chmod invocation.
+* --recursive <1>:                       rm invocation.
 * --recursive <2>:                       chgrp invocation.
-* --recursive <3>:                       chown invocation.
-* --recursive <4>:                       rm invocation.
-* --recursive <5>:                       cp invocation.
-* --recursive:                           Which files are listed.
-* --reference <1>:                       touch invocation.
-* --reference <2>:                       chmod invocation.
-* --reference <3>:                       chgrp invocation.
-* --reference:                           chown invocation.
+* --recursive <3>:                       cp invocation.
+* --recursive <4>:                       Which files are listed.
+* --recursive <5>:                       chown invocation.
+* --recursive:                           chmod invocation.
+* --reference <1>:                       chgrp invocation.
+* --reference <2>:                       chown invocation.
+* --reference <3>:                       touch invocation.
+* --reference:                           chmod invocation.
 * --remove:                              shred invocation.
 * --remove-destination:                  cp invocation.
 * --reverse:                             Sorting the output.
 * --separate-dirs:                       du invocation.
 * --sh:                                  dircolors invocation.
 * --show-control-chars:                  Formatting the file names.
-* --si <1>:                              du invocation.
-* --si <2>:                              df invocation.
-* --si <3>:                              What information is listed.
-* --si:                                  Block size.
-* --silent <1>:                          chmod invocation.
-* --silent <2>:                          chgrp invocation.
-* --silent:                              chown invocation.
+* --si <1>:                              What information is listed.
+* --si <2>:                              du invocation.
+* --si <3>:                              Block size.
+* --si:                                  df invocation.
+* --silent <1>:                          chown invocation.
+* --silent <2>:                          chmod invocation.
+* --silent:                              chgrp invocation.
 * --size:                                What information is listed.
 * --size=BYTES:                          shred invocation.
 * --sort:                                Sorting the output.
 * --sparse=WHEN:                         cp invocation.
 * --strip:                               install invocation.
-* --strip-trailing-slashes <1>:          mv invocation.
-* --strip-trailing-slashes:              cp invocation.
+* --strip-trailing-slashes <1>:          cp invocation.
+* --strip-trailing-slashes:              mv invocation.
 * --suffix <1>:                          ln invocation.
-* --suffix <2>:                          mv invocation.
-* --suffix <3>:                          install invocation.
-* --suffix <4>:                          cp invocation.
-* --suffix:                              Backup options.
+* --suffix <2>:                          Backup options.
+* --suffix <3>:                          cp invocation.
+* --suffix <4>:                          install invocation.
+* --suffix:                              mv invocation.
 * --summarize:                           du invocation.
 * --symbolic:                            ln invocation.
 * --symbolic-link:                       cp invocation.
 * --sync:                                df invocation.
 * --tabsize:                             General output formatting.
-* --target-directory <1>:                ln invocation.
+* --target-directory <1>:                cp invocation.
 * --target-directory <2>:                mv invocation.
 * --target-directory <3>:                install invocation.
-* --target-directory <4>:                cp invocation.
+* --target-directory <4>:                ln invocation.
 * --target-directory:                    Target directory.
-* --time <1>:                            touch invocation.
-* --time:                                Sorting the output.
+* --time <1>:                            Sorting the output.
+* --time <2>:                            touch invocation.
+* --time <3>:                            Sorting the output.
+* --time:                                touch invocation.
 * --total:                               du invocation.
 * --type:                                df invocation.
 * --update:                              mv invocation.
-* --verbose <1>:                         chmod invocation.
-* --verbose <2>:                         chgrp invocation.
+* --verbose <1>:                         chgrp invocation.
+* --verbose <2>:                         chmod invocation.
 * --verbose <3>:                         chown invocation.
-* --verbose <4>:                         rmdir invocation.
-* --verbose <5>:                         mkdir invocation.
-* --verbose <6>:                         ln invocation.
-* --verbose <7>:                         shred invocation.
-* --verbose <8>:                         rm invocation.
-* --verbose <9>:                         mv invocation.
-* --verbose <10>:                        install invocation.
-* --verbose:                             cp invocation.
+* --verbose <4>:                         mkdir invocation.
+* --verbose <5>:                         cp invocation.
+* --verbose <6>:                         install invocation.
+* --verbose <7>:                         mv invocation.
+* --verbose <8>:                         rmdir invocation.
+* --verbose <9>:                         shred invocation.
+* --verbose <10>:                        ln invocation.
+* --verbose:                             rm invocation.
 * --version:                             Common options.
-* --version-control <1>:                 ln invocation.
-* --version-control <2>:                 mv invocation.
-* --version-control <3>:                 install invocation.
+* --version-control <1>:                 Backup options.
+* --version-control <2>:                 install invocation.
+* --version-control <3>:                 mv invocation.
 * --version-control <4>:                 cp invocation.
-* --version-control:                     Backup options.
+* --version-control:                     ln invocation.
 * --width:                               General output formatting.
 * --zero:                                shred invocation.
 * -1:                                    General output formatting.
-* -a <1>:                                du invocation.
-* -a <2>:                                df invocation.
-* -a <3>:                                touch invocation.
-* -a:                                    cp invocation.
+* -a:                                    touch invocation.
 * -A:                                    Which files are listed.
-* -a:                                    Which files are listed.
+* -a <1>:                                df invocation.
+* -a <2>:                                cp invocation.
+* -a <3>:                                Which files are listed.
+* -a:                                    du invocation.
+* -B:                                    Which files are listed.
 * -b <1>:                                du invocation.
-* -b <2>:                                ln invocation.
-* -b <3>:                                mv invocation.
-* -b <4>:                                install invocation.
-* -b <5>:                                cp invocation.
+* -b <2>:                                install invocation.
+* -b <3>:                                ln invocation.
+* -b <4>:                                mv invocation.
+* -b <5>:                                Formatting the file names.
 * -b <6>:                                dircolors invocation.
-* -b:                                    Formatting the file names.
-* -B:                                    Which files are listed.
+* -b <7>:                                cp invocation.
 * -b:                                    Backup options.
-* -c <1>:                                du invocation.
-* -c <2>:                                touch invocation.
-* -c <3>:                                chmod invocation.
-* -c <4>:                                chgrp invocation.
-* -c <5>:                                chown invocation.
-* -c <6>:                                install invocation.
-* -c:                                    dircolors invocation.
+* -c <1>:                                chown invocation.
+* -c:                                    touch invocation.
 * -C:                                    General output formatting.
-* -c:                                    Sorting the output.
-* -D:                                    du invocation.
-* -d <1>:                                touch invocation.
-* -d <2>:                                ln invocation.
-* -d <3>:                                rm invocation.
-* -d <4>:                                install invocation.
-* -d:                                    cp invocation.
+* -c <1>:                                du invocation.
+* -c <2>:                                Sorting the output.
+* -c <3>:                                install invocation.
+* -c <4>:                                dircolors invocation.
+* -c <5>:                                chmod invocation.
+* -c:                                    chgrp invocation.
+* -d <1>:                                cp invocation.
+* -d:                                    install invocation.
 * -D:                                    What information is listed.
-* -d:                                    Which files are listed.
-* -f <1>:                                touch invocation.
-* -f <2>:                                chmod invocation.
-* -f <3>:                                chgrp invocation.
-* -f <4>:                                chown invocation.
-* -f:                                    ln invocation.
+* -d <1>:                                touch invocation.
+* -d <2>:                                Which files are listed.
+* -d:                                    ln invocation.
+* -D:                                    du invocation.
+* -d:                                    rm invocation.
 * -F:                                    ln invocation.
-* -f <1>:                                shred invocation.
-* -f <2>:                                rm invocation.
-* -f <3>:                                mv invocation.
-* -f:                                    cp invocation.
+* -f <1>:                                chmod invocation.
+* -f <2>:                                ln invocation.
+* -f <3>:                                rm invocation.
+* -f <4>:                                cp invocation.
+* -f <5>:                                chown invocation.
+* -f <6>:                                touch invocation.
+* -f <7>:                                chgrp invocation.
+* -f <8>:                                shred invocation.
+* -f:                                    mv invocation.
 * -F:                                    General output formatting.
 * -f:                                    Sorting the output.
 * -g:                                    install invocation.
 * -G:                                    What information is listed.
 * -g (ignored):                          ls invocation.
-* -H:                                    du invocation.
-* -h:                                    du invocation.
-* -H:                                    df invocation.
 * -h <1>:                                df invocation.
-* -h <2>:                                chgrp invocation.
-* -h:                                    chown invocation.
+* -h <2>:                                Block size.
+* -h:                                    What information is listed.
 * -H <1>:                                cp invocation.
-* -H:                                    What information is listed.
-* -h <1>:                                What information is listed.
-* -h:                                    Block size.
-* -i <1>:                                df invocation.
-* -i <2>:                                ln invocation.
-* -i <3>:                                rm invocation.
-* -i <4>:                                mv invocation.
-* -i <5>:                                cp invocation.
-* -i:                                    What information is listed.
+* -H:                                    df invocation.
+* -h:                                    du invocation.
+* -H <1>:                                What information is listed.
+* -H:                                    du invocation.
+* -h <1>:                                chown invocation.
+* -h:                                    chgrp invocation.
 * -I:                                    Which files are listed.
-* -k <1>:                                du invocation.
-* -k <2>:                                df invocation.
-* -k <3>:                                General output formatting.
-* -k:                                    Block size.
-* -L:                                    du invocation.
-* -l <1>:                                du invocation.
-* -l:                                    df invocation.
+* -i <1>:                                ln invocation.
+* -i <2>:                                cp invocation.
+* -i <3>:                                What information is listed.
+* -i <4>:                                rm invocation.
+* -i <5>:                                mv invocation.
+* -i:                                    df invocation.
+* -k <1>:                                df invocation.
+* -k <2>:                                Block size.
+* -k <3>:                                du invocation.
+* -k:                                    General output formatting.
+* -L <1>:                                Which files are listed.
 * -L:                                    cp invocation.
-* -l <1>:                                cp invocation.
+* -l:                                    du invocation.
+* -L:                                    du invocation.
+* -l <1>:                                df invocation.
+* -l <2>:                                cp invocation.
 * -l:                                    What information is listed.
-* -L:                                    Which files are listed.
-* -m <1>:                                du invocation.
-* -m <2>:                                df invocation.
-* -m <3>:                                touch invocation.
-* -m <4>:                                mknod invocation.
-* -m <5>:                                mkfifo invocation.
-* -m <6>:                                mkdir invocation.
-* -m <7>:                                install invocation.
-* -m:                                    General output formatting.
-* -n:                                    ln invocation.
+* -m <1>:                                General output formatting.
+* -m <2>:                                du invocation.
+* -m <3>:                                mkfifo invocation.
+* -m <4>:                                mkdir invocation.
+* -m <5>:                                df invocation.
+* -m <6>:                                mknod invocation.
+* -m <7>:                                touch invocation.
+* -m:                                    install invocation.
 * -N:                                    Formatting the file names.
-* -n:                                    General output formatting.
+* -n <1>:                                General output formatting.
+* -n:                                    ln invocation.
 * -n NUMBER:                             shred invocation.
 * -o <1>:                                install invocation.
 * -o:                                    What information is listed.
-* -P:                                    df invocation.
-* -p <1>:                                rmdir invocation.
-* -p <2>:                                mkdir invocation.
-* -p:                                    install invocation.
+* -p <1>:                                install invocation.
+* -p <2>:                                dircolors invocation.
+* -p <3>:                                cp invocation.
+* -p:                                    mkdir invocation.
 * -P:                                    cp invocation.
-* -p <1>:                                cp invocation.
-* -p:                                    dircolors invocation.
+* -p:                                    rmdir invocation.
+* -P:                                    df invocation.
 * -Q:                                    Formatting the file names.
 * -q:                                    Formatting the file names.
-* -r:                                    touch invocation.
 * -R <1>:                                chmod invocation.
-* -R <2>:                                chgrp invocation.
-* -R <3>:                                chown invocation.
-* -R:                                    rm invocation.
-* -r:                                    rm invocation.
-* -R:                                    cp invocation.
+* -R <2>:                                cp invocation.
+* -R <3>:                                rm invocation.
+* -R:                                    chown invocation.
 * -r:                                    Sorting the output.
 * -R:                                    Which files are listed.
-* -S:                                    du invocation.
-* -s:                                    du invocation.
-* -S:                                    ln invocation.
+* -r:                                    touch invocation.
+* -R:                                    chgrp invocation.
+* -r:                                    rm invocation.
 * -s:                                    ln invocation.
-* -S <1>:                                mv invocation.
-* -S:                                    install invocation.
+* -S <1>:                                Backup options.
+* -S <2>:                                Sorting the output.
+* -S <3>:                                mv invocation.
+* -S:                                    du invocation.
+* -s <1>:                                cp invocation.
 * -s:                                    install invocation.
-* -S:                                    cp invocation.
-* -s:                                    cp invocation.
-* -S:                                    Sorting the output.
+* -S:                                    install invocation.
+* -s <1>:                                du invocation.
 * -s:                                    What information is listed.
-* -S:                                    Backup options.
+* -S <1>:                                cp invocation.
+* -S:                                    ln invocation.
 * -s BYTES:                              shred invocation.
-* -T:                                    df invocation.
 * -t:                                    df invocation.
 * -T:                                    General output formatting.
 * -t:                                    Sorting the output.
-* -u <1>:                                shred invocation.
-* -u:                                    mv invocation.
+* -T:                                    df invocation.
+* -u:                                    shred invocation.
 * -U:                                    Sorting the output.
+* -u <1>:                                mv invocation.
 * -u:                                    Sorting the output.
-* -v <1>:                                chmod invocation.
-* -v <2>:                                chgrp invocation.
-* -v <3>:                                chown invocation.
-* -v <4>:                                rmdir invocation.
-* -v:                                    mkdir invocation.
+* -v <1>:                                chown invocation.
+* -v <2>:                                ln invocation.
+* -v:                                    mv invocation.
 * -V:                                    ln invocation.
-* -v <1>:                                ln invocation.
-* -v <2>:                                shred invocation.
-* -v:                                    rm invocation.
+* -v <1>:                                chgrp invocation.
+* -v:                                    shred invocation.
+* -V <1>:                                install invocation.
 * -V:                                    mv invocation.
-* -v:                                    mv invocation.
-* -V:                                    install invocation.
-* -v:                                    install invocation.
+* -v <1>:                                mkdir invocation.
+* -v <2>:                                rm invocation.
+* -v:                                    chmod invocation.
 * -V:                                    cp invocation.
-* -v <1>:                                cp invocation.
-* -v:                                    Sorting the output.
+* -v <1>:                                rmdir invocation.
+* -v <2>:                                Sorting the output.
+* -v <3>:                                cp invocation.
+* -v:                                    install invocation.
 * -w:                                    General output formatting.
-* -x <1>:                                du invocation.
-* -x <2>:                                df invocation.
-* -x <3>:                                shred invocation.
-* -x <4>:                                cp invocation.
-* -x:                                    General output formatting.
 * -X:                                    Sorting the output.
+* -x <1>:                                shred invocation.
+* -x <2>:                                cp invocation.
+* -x <3>:                                du invocation.
+* -x <4>:                                General output formatting.
+* -x:                                    df invocation.
 * -X FILE:                               du invocation.
 * -z:                                    shred invocation.
 * 4.2 filesystem type:                   df invocation.
@@ -3675,10 +3678,10 @@ Index
 * backup options:                        Backup options.
 * backup suffix:                         Backup options.
 * backups, making <1>:                   ln invocation.
-* backups, making <2>:                   mv invocation.
-* backups, making <3>:                   install invocation.
-* backups, making <4>:                   cp invocation.
-* backups, making:                       Backup options.
+* backups, making <2>:                   cp invocation.
+* backups, making <3>:                   mv invocation.
+* backups, making <4>:                   Backup options.
+* backups, making:                       install invocation.
 * backups, making only:                  cp invocation.
 * beginning of time, for POSIX:          Date input formats.
 * Bellovin, Steven M.:                   Authors of getdate.
@@ -3711,8 +3714,8 @@ Index
 * changing file attributes:              Changing file attributes.
 * changing file ownership:               chown invocation.
 * changing file timestamps:              touch invocation.
-* changing group ownership <1>:          chgrp invocation.
-* changing group ownership:              chown invocation.
+* changing group ownership <1>:          chown invocation.
+* changing group ownership:              chgrp invocation.
 * changing special permissions:          Changing Special Permissions.
 * character special files:               mknod invocation.
 * character special files, creating:     mknod invocation.
@@ -3750,11 +3753,11 @@ Index
 * day of week item:                      Day of week items.
 * dd:                                    dd invocation.
 * dereferencing symbolic links:          ln invocation.
-* destination directory <1>:             ln invocation.
-* destination directory <2>:             mv invocation.
-* destination directory <3>:             install invocation.
-* destination directory <4>:             cp invocation.
-* destination directory:                 Target directory.
+* destination directory <1>:             mv invocation.
+* destination directory <2>:             Target directory.
+* destination directory <3>:             cp invocation.
+* destination directory <4>:             ln invocation.
+* destination directory:                 install invocation.
 * device file, disk:                     df invocation.
 * df:                                    df invocation.
 * DF_BLOCK_SIZE:                         Block size.
@@ -3792,8 +3795,8 @@ Index
 * epoch, for POSIX:                      Date input formats.
 * erasing data:                          shred invocation.
 * error messages, omitting <1>:          chmod invocation.
-* error messages, omitting <2>:          chgrp invocation.
-* error messages, omitting:              chown invocation.
+* error messages, omitting <2>:          chown invocation.
+* error messages, omitting:              chgrp invocation.
 * excluding files from du:               du invocation.
 * executables and file type, marking:    General output formatting.
 * execute permission:                    Mode Structure.
@@ -3847,9 +3850,9 @@ Index
 * horizontal, listing files:             General output formatting.
 * hour in date strings:                  Relative items in date strings.
 * hsfs filesystem type:                  df invocation.
-* human-readable output <1>:             du invocation.
+* human-readable output <1>:             What information is listed.
 * human-readable output <2>:             df invocation.
-* human-readable output <3>:             What information is listed.
+* human-readable output <3>:             du invocation.
 * human-readable output:                 Block size.
 * ibs:                                   dd invocation.
 * if:                                    dd invocation.
@@ -3869,7 +3872,8 @@ Index
 * last DAY:                              Day of week items.
 * last in date strings:                  General date syntax.
 * lcase, converting to:                  dd invocation.
-* lchown <1>:                            chgrp invocation.
+* lchown <1>:                            chown invocation.
+* lchown <2>:                            chgrp invocation.
 * lchown:                                chown invocation.
 * leading directories, creating missing: install invocation.
 * limiting output of du:                 du invocation.
@@ -3884,8 +3888,8 @@ Index
 * MacKenzie, David:                      Authors of getdate.
 * Makefiles, installing programs in:     install invocation.
 * manipulating files:                    Basic operations.
-* megabytes for filesystem sizes <1>:    du invocation.
-* megabytes for filesystem sizes:        df invocation.
+* megabytes for filesystem sizes <1>:    df invocation.
+* megabytes for filesystem sizes:        du invocation.
 * Meyering, Jim:                         Authors of getdate.
 * midnight in date strings:              Time of day items.
 * minute in date strings:                Relative items in date strings.
@@ -3993,8 +3997,8 @@ Index
 * sh syntax for color setup:             dircolors invocation.
 * SHELL environment variable, and color: dircolors invocation.
 * shred:                                 shred invocation.
-* SI output <1>:                         du invocation.
-* SI output <2>:                         df invocation.
+* SI output <1>:                         df invocation.
+* SI output <2>:                         du invocation.
 * SI output <3>:                         What information is listed.
 * SI output:                             Block size.
 * simple backup method:                  Backup options.
@@ -4011,8 +4015,8 @@ Index
 * status time, printing or sorting by:   Sorting the output.
 * sticky:                                Mode Structure.
 * stripping symbol table information:    install invocation.
-* stripping trailing slashes <1>:        mv invocation.
-* stripping trailing slashes:            cp invocation.
+* stripping trailing slashes <1>:        cp invocation.
+* stripping trailing slashes:            mv invocation.
 * subtracting permissions:               Setting Permissions.
 * superblock, writing:                   sync invocation.
 * swab (byte-swapping):                  dd invocation.
@@ -4021,7 +4025,8 @@ Index
 * symbolic (soft) links, creating:       ln invocation.
 * symbolic link, defined:                ln invocation.
 * symbolic links, changing group:        chgrp invocation.
-* symbolic links, changing owner <1>:    chgrp invocation.
+* symbolic links, changing owner <1>:    chown invocation.
+* symbolic links, changing owner <2>:    chgrp invocation.
 * symbolic links, changing owner:        chown invocation.
 * symbolic links, copying:               cp invocation.
 * symbolic links, copying with:          cp invocation.
@@ -4032,11 +4037,12 @@ Index
 * sync:                                  sync invocation.
 * sync (padding with nulls):             dd invocation.
 * synchronize disk and memory:           sync invocation.
-* target directory <1>:                  ln invocation.
-* target directory <2>:                  mv invocation.
-* target directory <3>:                  install invocation.
-* target directory <4>:                  cp invocation.
-* target directory:                      Target directory.
+* target directory <1>:                  Target directory.
+* target directory <2>:                  ln invocation.
+* target directory <3>:                  cp invocation.
+* target directory <4>:                  Target directory.
+* target directory <5>:                  mv invocation.
+* target directory:                      install invocation.
 * terminal, using color iff:             General output formatting.
 * text image, saving in swap space:      Mode Structure.
 * this in date strings:                  Relative items in date strings.
@@ -4066,11 +4072,11 @@ Index
 * version number, finding:               Common options.
 * version, sorting option for ls:        Sorting the output.
 * version-control Emacs variable:        Backup options.
-* VERSION_CONTROL <1>:                   ln invocation.
-* VERSION_CONTROL <2>:                   mv invocation.
-* VERSION_CONTROL <3>:                   install invocation.
-* VERSION_CONTROL <4>:                   cp invocation.
-* VERSION_CONTROL:                       Backup options.
+* VERSION_CONTROL <1>:                   Backup options.
+* VERSION_CONTROL <2>:                   cp invocation.
+* VERSION_CONTROL <3>:                   mv invocation.
+* VERSION_CONTROL <4>:                   ln invocation.
+* VERSION_CONTROL:                       install invocation.
 * vertical sorted files in columns:      General output formatting.
 * week in date strings:                  Relative items in date strings.
 * write permission:                      Mode Structure.
--- /dev/c/develop/ports/orig/fileutils-4.1/m4/libintl.m4	2001-01-01 11:16:42.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/m4/libintl.m4	2002-06-11 13:41:48.000000000 +0000
@@ -269,7 +269,7 @@ strdup __argz_count __argz_stringify __a
    fi
    dnl po2tbl.sed is always needed.
    sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+     $srcdir/intl/po2tbl-sed.in > intl/po2tbl.sed
 
    dnl In the intl/Makefile.in we have a special dependency which makes
    dnl only sense for gettext.  We comment this out for non-gettext
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/Makefile.am	2001-03-04 03:05:12.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/Makefile.am	2002-06-12 00:59:16.000000000 +0000
@@ -7,6 +7,8 @@ noinst_LIBRARIES = libfetish.a
 INCLUDES = -I.. -I$(srcdir) -I../intl
 DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
+OBJEXT = @OBJEXT@
+
 libfetish_a_SOURCES = \
   getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
   canon-host.c closeout.c diacrit.c dirname.c dup-safer.c \
@@ -47,8 +49,8 @@ lstat.c: xstat.in
 	  -e 's/@xstat@/lstat/g' \
 	  -e '/_LSTAT_ONLY@/d' \
 	  -e '/@BEGIN_STAT_ONLY@/,/@END_STAT_ONLY@/d' \
-	  $(srcdir)/xstat.in > $@-t
-	mv $@-t $@
+	  $(srcdir)/xstat.in > t-$@
+	mv t-$@ $@
 
 stat.c: xstat.in
 	sed \
@@ -56,8 +58,8 @@ stat.c: xstat.in
 	  -e 's/@xstat@/stat/g' \
 	  -e '/_STAT_ONLY@/d' \
 	  -e '/@BEGIN_LSTAT_ONLY@/,/@END_LSTAT_ONLY@/d' \
-	  $(srcdir)/xstat.in > $@-t
-	mv $@-t $@
+	  $(srcdir)/xstat.in > t-$@
+	mv t-$@ $@
 
 
 # The following is needed in order to install a simple file in $(libdir)
@@ -103,7 +105,7 @@ charset.alias: config.charset
 
 SUFFIXES = .sed .sin
 .sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > $@-t
-	mv $@-t $@
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+	mv t-$@ $@
 
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/Makefile.in	2001-04-29 08:25:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/Makefile.in	2002-06-12 01:00:20.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,7 +88,6 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -101,6 +95,7 @@ NEED_SETGID = @NEED_SETGID@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,16 +103,17 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
+OBJEXT = @OBJEXT@
 
 AUTOMAKE_OPTIONS = ../src/ansi2knr
 
@@ -169,381 +165,515 @@ charset_tmp = $(DESTDIR)$(libdir)/charse
 SUFFIXES = .sed .sin
 
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
-EXEEXT =
-OBJEXT = o
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../src/ansi2knr
 libfetish_a_AR = $(AR) cru
 am_libfetish_a_OBJECTS = getdate$U.$(OBJEXT) posixtm$U.$(OBJEXT) \
-addext$U.$(OBJEXT) argmatch$U.$(OBJEXT) backupfile$U.$(OBJEXT) \
-basename$U.$(OBJEXT) canon-host$U.$(OBJEXT) closeout$U.$(OBJEXT) \
-diacrit$U.$(OBJEXT) dirname$U.$(OBJEXT) dup-safer$U.$(OBJEXT) \
-exclude$U.$(OBJEXT) filemode$U.$(OBJEXT) fopen-safer$U.$(OBJEXT) \
-full-write$U.$(OBJEXT) getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) \
-getstr$U.$(OBJEXT) getugroups$U.$(OBJEXT) hard-locale$U.$(OBJEXT) \
-hash$U.$(OBJEXT) human$U.$(OBJEXT) idcache$U.$(OBJEXT) \
-isdir$U.$(OBJEXT) linebuffer$U.$(OBJEXT) localcharset$U.$(OBJEXT) \
-long-options$U.$(OBJEXT) makepath$U.$(OBJEXT) mbswidth$U.$(OBJEXT) \
-md5$U.$(OBJEXT) memcasecmp$U.$(OBJEXT) memcoll$U.$(OBJEXT) \
-modechange$U.$(OBJEXT) path-concat$U.$(OBJEXT) physmem$U.$(OBJEXT) \
-quote$U.$(OBJEXT) quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) \
-safe-read$U.$(OBJEXT) same$U.$(OBJEXT) save-cwd$U.$(OBJEXT) \
-savedir$U.$(OBJEXT) sha$U.$(OBJEXT) stripslash$U.$(OBJEXT) \
-unicodeio$U.$(OBJEXT) userspec$U.$(OBJEXT) version-etc$U.$(OBJEXT) \
-xgetcwd$U.$(OBJEXT) xgethostname$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
-xstrdup$U.$(OBJEXT) xstrtod$U.$(OBJEXT) xstrtol$U.$(OBJEXT) \
-xstrtoul$U.$(OBJEXT) xstrtoumax$U.$(OBJEXT) yesno$U.$(OBJEXT)
+	addext$U.$(OBJEXT) argmatch$U.$(OBJEXT) backupfile$U.$(OBJEXT) \
+	basename$U.$(OBJEXT) canon-host$U.$(OBJEXT) \
+	closeout$U.$(OBJEXT) diacrit$U.$(OBJEXT) dirname$U.$(OBJEXT) \
+	dup-safer$U.$(OBJEXT) exclude$U.$(OBJEXT) filemode$U.$(OBJEXT) \
+	fopen-safer$U.$(OBJEXT) full-write$U.$(OBJEXT) \
+	getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) getstr$U.$(OBJEXT) \
+	getugroups$U.$(OBJEXT) hard-locale$U.$(OBJEXT) hash$U.$(OBJEXT) \
+	human$U.$(OBJEXT) idcache$U.$(OBJEXT) isdir$U.$(OBJEXT) \
+	linebuffer$U.$(OBJEXT) localcharset$U.$(OBJEXT) \
+	long-options$U.$(OBJEXT) makepath$U.$(OBJEXT) \
+	mbswidth$U.$(OBJEXT) md5$U.$(OBJEXT) memcasecmp$U.$(OBJEXT) \
+	memcoll$U.$(OBJEXT) modechange$U.$(OBJEXT) \
+	path-concat$U.$(OBJEXT) physmem$U.$(OBJEXT) quote$U.$(OBJEXT) \
+	quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) \
+	safe-read$U.$(OBJEXT) same$U.$(OBJEXT) save-cwd$U.$(OBJEXT) \
+	savedir$U.$(OBJEXT) sha$U.$(OBJEXT) stripslash$U.$(OBJEXT) \
+	unicodeio$U.$(OBJEXT) userspec$U.$(OBJEXT) \
+	version-etc$U.$(OBJEXT) xgetcwd$U.$(OBJEXT) \
+	xgethostname$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
+	xstrdup$U.$(OBJEXT) xstrtod$U.$(OBJEXT) xstrtol$U.$(OBJEXT) \
+	xstrtoul$U.$(OBJEXT) xstrtoumax$U.$(OBJEXT) yesno$U.$(OBJEXT)
 libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS)
-AR = ar
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CFLAGS = @CFLAGS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/atexit.Po $(DEPDIR)/backupfile$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/basename$U.Po $(DEPDIR)/canon-host$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/chown.Po $(DEPDIR)/closeout$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/dup-safer$U.Po $(DEPDIR)/dup2.Po \
+@AMDEP_TRUE@	$(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
+@AMDEP_TRUE@	$(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po \
+@AMDEP_TRUE@	$(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fopen-safer$U.Po $(DEPDIR)/fsusage.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
+@AMDEP_TRUE@	$(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
+@AMDEP_TRUE@	$(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/isdir$U.Po $(DEPDIR)/lchown.Po \
+@AMDEP_TRUE@	$(DEPDIR)/linebuffer$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/localcharset$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/long-options$U.Po $(DEPDIR)/lstat.Po \
+@AMDEP_TRUE@	$(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
+@AMDEP_TRUE@	$(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \
+@AMDEP_TRUE@	$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
+@AMDEP_TRUE@	$(DEPDIR)/path-concat$U.Po $(DEPDIR)/physmem$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po \
+@AMDEP_TRUE@	$(DEPDIR)/quote$U.Po $(DEPDIR)/quotearg$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/readtokens$U.Po $(DEPDIR)/readutmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rpmatch.Po $(DEPDIR)/safe-read$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/same$U.Po $(DEPDIR)/save-cwd$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/savedir$U.Po $(DEPDIR)/sha$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
+@AMDEP_TRUE@	$(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strtoull.Po $(DEPDIR)/strtoumax.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strverscmp.Po $(DEPDIR)/tempname.Po \
+@AMDEP_TRUE@	$(DEPDIR)/unicodeio$U.Po $(DEPDIR)/userspec$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/utime.Po $(DEPDIR)/version-etc$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/xgetcwd$U.Po $(DEPDIR)/xgethostname$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/xstrtod$U.Po $(DEPDIR)/xstrtol$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/xstrtoul$U.Po $(DEPDIR)/xstrtoumax$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/yesno$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
 DIST_SOURCES = $(libfetish_a_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/__fpending.Po $(DEPDIR)/addext$U.Po \
-@AMDEP@ $(DEPDIR)/alloca.Po $(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po \
-@AMDEP@ $(DEPDIR)/backupfile$U.Po $(DEPDIR)/basename$U.Po \
-@AMDEP@ $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \
-@AMDEP@ $(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po \
-@AMDEP@ $(DEPDIR)/dirname$U.Po $(DEPDIR)/dup-safer$U.Po \
-@AMDEP@ $(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \
-@AMDEP@ $(DEPDIR)/exclude$U.Po $(DEPDIR)/fileblocks.Po \
-@AMDEP@ $(DEPDIR)/filemode$U.Po $(DEPDIR)/fnmatch.Po \
-@AMDEP@ $(DEPDIR)/fopen-safer$U.Po $(DEPDIR)/fsusage.Po \
-@AMDEP@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/full-write$U.Po \
-@AMDEP@ $(DEPDIR)/getdate$U.Po $(DEPDIR)/getgroups.Po \
-@AMDEP@ $(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \
-@AMDEP@ $(DEPDIR)/getloadavg.Po $(DEPDIR)/getopt$U.Po \
-@AMDEP@ $(DEPDIR)/getopt1$U.Po $(DEPDIR)/getpass.Po \
-@AMDEP@ $(DEPDIR)/getstr$U.Po $(DEPDIR)/getugroups$U.Po \
-@AMDEP@ $(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \
-@AMDEP@ $(DEPDIR)/hard-locale$U.Po $(DEPDIR)/hash$U.Po \
-@AMDEP@ $(DEPDIR)/human$U.Po $(DEPDIR)/idcache$U.Po $(DEPDIR)/isdir$U.Po \
-@AMDEP@ $(DEPDIR)/lchown.Po $(DEPDIR)/linebuffer$U.Po \
-@AMDEP@ $(DEPDIR)/localcharset$U.Po $(DEPDIR)/long-options$U.Po \
-@AMDEP@ $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po $(DEPDIR)/malloc.Po \
-@AMDEP@ $(DEPDIR)/mbswidth$U.Po $(DEPDIR)/md5$U.Po \
-@AMDEP@ $(DEPDIR)/memcasecmp$U.Po $(DEPDIR)/memchr.Po \
-@AMDEP@ $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po $(DEPDIR)/memcpy.Po \
-@AMDEP@ $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
-@AMDEP@ $(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \
-@AMDEP@ $(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \
-@AMDEP@ $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
-@AMDEP@ $(DEPDIR)/path-concat$U.Po $(DEPDIR)/physmem$U.Po \
-@AMDEP@ $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quote$U.Po \
-@AMDEP@ $(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \
-@AMDEP@ $(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
-@AMDEP@ $(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \
-@AMDEP@ $(DEPDIR)/safe-read$U.Po $(DEPDIR)/same$U.Po \
-@AMDEP@ $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \
-@AMDEP@ $(DEPDIR)/sha$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \
-@AMDEP@ $(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
-@AMDEP@ $(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po \
-@AMDEP@ $(DEPDIR)/stripslash$U.Po $(DEPDIR)/strncasecmp.Po \
-@AMDEP@ $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \
-@AMDEP@ $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po $(DEPDIR)/strtol.Po \
-@AMDEP@ $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \
-@AMDEP@ $(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \
-@AMDEP@ $(DEPDIR)/tempname.Po $(DEPDIR)/unicodeio$U.Po \
-@AMDEP@ $(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po \
-@AMDEP@ $(DEPDIR)/version-etc$U.Po $(DEPDIR)/xgetcwd$U.Po \
-@AMDEP@ $(DEPDIR)/xgethostname$U.Po $(DEPDIR)/xmalloc$U.Po \
-@AMDEP@ $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \
-@AMDEP@ $(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \
-@AMDEP@ $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po
-DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \
-TODO __fpending.c alloca.c atexit.c chown.c dup2.c error.c error.h \
-euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \
-getgroups.c gethostname.c getline.c getloadavg.c getpass.c \
-getusershell.c group-member.c lchown.c malloc.c memchr.c memcmp.c \
-memcpy.c memmove.c memrchr.c memset.c mkstemp.c mktime.c mountlist.c \
-nanosleep.c obstack.c obstack.h putenv.c readutmp.c realloc.c regex.c \
-rename.c rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c \
-strdup.c strftime.c strncasecmp.c strndup.c strnlen.c strpbrk.c \
-strstr.c strtod.c strtol.c strtoul.c strtoull.c strtoumax.c \
-strverscmp.c tempname.c utime.c
-
+DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
+	Makefile.in TODO __fpending.c alloca.c atexit.c chown.c dup2.c \
+	error.c error.h euidaccess.c fileblocks.c fnmatch.c fsusage.c \
+	ftruncate.c getdate.c getgroups.c gethostname.c getline.c \
+	getloadavg.c getpass.c getusershell.c group-member.c lchown.c \
+	malloc.c memchr.c memcmp.c memcpy.c memmove.c memrchr.c \
+	memset.c mkstemp.c mktime.c mountlist.c nanosleep.c obstack.c \
+	obstack.h putenv.c readutmp.c realloc.c regex.c rename.c \
+	rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c \
+	strdup.c strftime.c strncasecmp.c strndup.c strnlen.c strpbrk.c \
+	strstr.c strtod.c strtol.c strtoul.c strtoull.c strtoumax.c \
+	strverscmp.c tempname.c utime.c
 SOURCES = $(libfetish_a_SOURCES)
-OBJECTS = $(am_libfetish_a_OBJECTS)
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .sed .sin .c .o .obj .y
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  lib/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  lib/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
+AR = ar
+
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libfetish.a: $(libfetish_a_OBJECTS) $(libfetish_a_DEPENDENCIES) 
+	-rm -f libfetish.a
+	$(libfetish_a_AR) libfetish.a $(libfetish_a_OBJECTS) $(libfetish_a_LIBADD)
+	$(RANLIB) libfetish.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../src/ansi2knr: ../src/ansi2knr.$(OBJEXT)
-	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../src/ansi2knr.$(OBJEXT):
-	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../src/ansi2knr
+../src/ansi2knr:
+	cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-libfetish.a: $(libfetish_a_OBJECTS) $(libfetish_a_DEPENDENCIES)
-	-rm -f libfetish.a
-	$(libfetish_a_AR) libfetish.a $(libfetish_a_OBJECTS) $(libfetish_a_LIBADD)
-	$(RANLIB) libfetish.a
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__fpending.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/addext$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/argmatch$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/atexit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/backupfile$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basename$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/canon-host$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/closeout$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diacrit$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dirname$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup-safer$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/euidaccess.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/exclude$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fileblocks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filemode$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fopen-safer$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fsusage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/full-write$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getgroups.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gethostname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getline.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getloadavg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getpass.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getstr$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getugroups$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getusershell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/group-member.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hard-locale$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/human$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/idcache$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/isdir$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lchown.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/linebuffer$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/localcharset$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/long-options$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lstat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/makepath$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mbswidth$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcasecmp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memchr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcoll$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memrchr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memset.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mktime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/modechange$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mountlist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nanosleep.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/path-concat$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/physmem$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/posixtm$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/quote$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/quotearg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readtokens$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readutmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rmdir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rpmatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/safe-read$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/same$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/save-cwd$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/savedir$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sha$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcspn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strftime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stripslash$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strpbrk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtol.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoull.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoumax.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strverscmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/unicodeio$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/userspec$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/utime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/version-etc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xgetcwd$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xgethostname$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xmalloc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrdup$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrtod$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrtol$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrtoul$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrtoumax$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yesno$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 __fpending_.c: __fpending.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/__fpending.c; then echo $(srcdir)/__fpending.c; else echo __fpending.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > __fpending_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/__fpending.c; then echo $(srcdir)/__fpending.c; else echo __fpending.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > __fpending_.c || rm -f __fpending_.c
 addext_.c: addext.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/addext.c; then echo $(srcdir)/addext.c; else echo addext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > addext_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/addext.c; then echo $(srcdir)/addext.c; else echo addext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > addext_.c || rm -f addext_.c
 alloca_.c: alloca.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c || rm -f alloca_.c
 argmatch_.c: argmatch.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/argmatch.c; then echo $(srcdir)/argmatch.c; else echo argmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > argmatch_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/argmatch.c; then echo $(srcdir)/argmatch.c; else echo argmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > argmatch_.c || rm -f argmatch_.c
 atexit_.c: atexit.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atexit.c; then echo $(srcdir)/atexit.c; else echo atexit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atexit_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atexit.c; then echo $(srcdir)/atexit.c; else echo atexit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atexit_.c || rm -f atexit_.c
 backupfile_.c: backupfile.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/backupfile.c; then echo $(srcdir)/backupfile.c; else echo backupfile.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > backupfile_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/backupfile.c; then echo $(srcdir)/backupfile.c; else echo backupfile.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > backupfile_.c || rm -f backupfile_.c
 basename_.c: basename.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/basename.c; then echo $(srcdir)/basename.c; else echo basename.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > basename_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/basename.c; then echo $(srcdir)/basename.c; else echo basename.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > basename_.c || rm -f basename_.c
 canon-host_.c: canon-host.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/canon-host.c; then echo $(srcdir)/canon-host.c; else echo canon-host.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > canon-host_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/canon-host.c; then echo $(srcdir)/canon-host.c; else echo canon-host.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > canon-host_.c || rm -f canon-host_.c
 chown_.c: chown.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chown.c; then echo $(srcdir)/chown.c; else echo chown.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chown_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chown.c; then echo $(srcdir)/chown.c; else echo chown.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chown_.c || rm -f chown_.c
 closeout_.c: closeout.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/closeout.c; then echo $(srcdir)/closeout.c; else echo closeout.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > closeout_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/closeout.c; then echo $(srcdir)/closeout.c; else echo closeout.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > closeout_.c || rm -f closeout_.c
 diacrit_.c: diacrit.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/diacrit.c; then echo $(srcdir)/diacrit.c; else echo diacrit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > diacrit_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/diacrit.c; then echo $(srcdir)/diacrit.c; else echo diacrit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > diacrit_.c || rm -f diacrit_.c
 dirname_.c: dirname.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dirname.c; then echo $(srcdir)/dirname.c; else echo dirname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dirname_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dirname.c; then echo $(srcdir)/dirname.c; else echo dirname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dirname_.c || rm -f dirname_.c
 dup-safer_.c: dup-safer.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup-safer.c; then echo $(srcdir)/dup-safer.c; else echo dup-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup-safer_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup-safer.c; then echo $(srcdir)/dup-safer.c; else echo dup-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup-safer_.c || rm -f dup-safer_.c
 dup2_.c: dup2.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup2.c; then echo $(srcdir)/dup2.c; else echo dup2.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup2_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dup2.c; then echo $(srcdir)/dup2.c; else echo dup2.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dup2_.c || rm -f dup2_.c
 error_.c: error.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c || rm -f error_.c
 euidaccess_.c: euidaccess.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/euidaccess.c; then echo $(srcdir)/euidaccess.c; else echo euidaccess.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > euidaccess_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/euidaccess.c; then echo $(srcdir)/euidaccess.c; else echo euidaccess.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > euidaccess_.c || rm -f euidaccess_.c
 exclude_.c: exclude.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exclude.c; then echo $(srcdir)/exclude.c; else echo exclude.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > exclude_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exclude.c; then echo $(srcdir)/exclude.c; else echo exclude.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > exclude_.c || rm -f exclude_.c
 fileblocks_.c: fileblocks.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fileblocks.c; then echo $(srcdir)/fileblocks.c; else echo fileblocks.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fileblocks_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fileblocks.c; then echo $(srcdir)/fileblocks.c; else echo fileblocks.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fileblocks_.c || rm -f fileblocks_.c
 filemode_.c: filemode.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/filemode.c; then echo $(srcdir)/filemode.c; else echo filemode.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > filemode_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/filemode.c; then echo $(srcdir)/filemode.c; else echo filemode.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > filemode_.c || rm -f filemode_.c
 fnmatch_.c: fnmatch.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnmatch.c; then echo $(srcdir)/fnmatch.c; else echo fnmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnmatch_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnmatch.c; then echo $(srcdir)/fnmatch.c; else echo fnmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnmatch_.c || rm -f fnmatch_.c
 fopen-safer_.c: fopen-safer.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fopen-safer.c; then echo $(srcdir)/fopen-safer.c; else echo fopen-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fopen-safer_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fopen-safer.c; then echo $(srcdir)/fopen-safer.c; else echo fopen-safer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fopen-safer_.c || rm -f fopen-safer_.c
 fsusage_.c: fsusage.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fsusage.c; then echo $(srcdir)/fsusage.c; else echo fsusage.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fsusage_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fsusage.c; then echo $(srcdir)/fsusage.c; else echo fsusage.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fsusage_.c || rm -f fsusage_.c
 ftruncate_.c: ftruncate.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ftruncate.c; then echo $(srcdir)/ftruncate.c; else echo ftruncate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ftruncate_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ftruncate.c; then echo $(srcdir)/ftruncate.c; else echo ftruncate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ftruncate_.c || rm -f ftruncate_.c
 full-write_.c: full-write.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/full-write.c; then echo $(srcdir)/full-write.c; else echo full-write.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > full-write_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/full-write.c; then echo $(srcdir)/full-write.c; else echo full-write.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > full-write_.c || rm -f full-write_.c
 getdate_.c: getdate.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getdate.c; then echo $(srcdir)/getdate.c; else echo getdate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getdate_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getdate.c; then echo $(srcdir)/getdate.c; else echo getdate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getdate_.c || rm -f getdate_.c
 getgroups_.c: getgroups.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getgroups.c; then echo $(srcdir)/getgroups.c; else echo getgroups.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getgroups_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getgroups.c; then echo $(srcdir)/getgroups.c; else echo getgroups.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getgroups_.c || rm -f getgroups_.c
 gethostname_.c: gethostname.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gethostname.c; then echo $(srcdir)/gethostname.c; else echo gethostname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gethostname_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gethostname.c; then echo $(srcdir)/gethostname.c; else echo gethostname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gethostname_.c || rm -f gethostname_.c
 getline_.c: getline.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getline.c; then echo $(srcdir)/getline.c; else echo getline.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getline_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getline.c; then echo $(srcdir)/getline.c; else echo getline.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getline_.c || rm -f getline_.c
 getloadavg_.c: getloadavg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getloadavg.c; then echo $(srcdir)/getloadavg.c; else echo getloadavg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getloadavg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getloadavg.c; then echo $(srcdir)/getloadavg.c; else echo getloadavg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getloadavg_.c || rm -f getloadavg_.c
 getopt_.c: getopt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c || rm -f getopt_.c
 getopt1_.c: getopt1.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c || rm -f getopt1_.c
 getpass_.c: getpass.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getpass.c; then echo $(srcdir)/getpass.c; else echo getpass.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getpass_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getpass.c; then echo $(srcdir)/getpass.c; else echo getpass.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getpass_.c || rm -f getpass_.c
 getstr_.c: getstr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getstr.c; then echo $(srcdir)/getstr.c; else echo getstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getstr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getstr.c; then echo $(srcdir)/getstr.c; else echo getstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getstr_.c || rm -f getstr_.c
 getugroups_.c: getugroups.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getugroups.c; then echo $(srcdir)/getugroups.c; else echo getugroups.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getugroups_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getugroups.c; then echo $(srcdir)/getugroups.c; else echo getugroups.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getugroups_.c || rm -f getugroups_.c
 getusershell_.c: getusershell.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getusershell.c; then echo $(srcdir)/getusershell.c; else echo getusershell.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getusershell_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getusershell.c; then echo $(srcdir)/getusershell.c; else echo getusershell.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getusershell_.c || rm -f getusershell_.c
 group-member_.c: group-member.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/group-member.c; then echo $(srcdir)/group-member.c; else echo group-member.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > group-member_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/group-member.c; then echo $(srcdir)/group-member.c; else echo group-member.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > group-member_.c || rm -f group-member_.c
 hard-locale_.c: hard-locale.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hard-locale.c; then echo $(srcdir)/hard-locale.c; else echo hard-locale.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hard-locale_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hard-locale.c; then echo $(srcdir)/hard-locale.c; else echo hard-locale.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hard-locale_.c || rm -f hard-locale_.c
 hash_.c: hash.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hash.c; then echo $(srcdir)/hash.c; else echo hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hash_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hash.c; then echo $(srcdir)/hash.c; else echo hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hash_.c || rm -f hash_.c
 human_.c: human.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/human.c; then echo $(srcdir)/human.c; else echo human.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > human_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/human.c; then echo $(srcdir)/human.c; else echo human.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > human_.c || rm -f human_.c
 idcache_.c: idcache.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/idcache.c; then echo $(srcdir)/idcache.c; else echo idcache.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > idcache_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/idcache.c; then echo $(srcdir)/idcache.c; else echo idcache.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > idcache_.c || rm -f idcache_.c
 isdir_.c: isdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/isdir.c; then echo $(srcdir)/isdir.c; else echo isdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > isdir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/isdir.c; then echo $(srcdir)/isdir.c; else echo isdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > isdir_.c || rm -f isdir_.c
 lchown_.c: lchown.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lchown.c; then echo $(srcdir)/lchown.c; else echo lchown.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lchown_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lchown.c; then echo $(srcdir)/lchown.c; else echo lchown.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lchown_.c || rm -f lchown_.c
 linebuffer_.c: linebuffer.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/linebuffer.c; then echo $(srcdir)/linebuffer.c; else echo linebuffer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > linebuffer_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/linebuffer.c; then echo $(srcdir)/linebuffer.c; else echo linebuffer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > linebuffer_.c || rm -f linebuffer_.c
 localcharset_.c: localcharset.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/localcharset.c; then echo $(srcdir)/localcharset.c; else echo localcharset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > localcharset_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/localcharset.c; then echo $(srcdir)/localcharset.c; else echo localcharset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > localcharset_.c || rm -f localcharset_.c
 long-options_.c: long-options.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/long-options.c; then echo $(srcdir)/long-options.c; else echo long-options.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > long-options_.c
-lstat_.c: lstat.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lstat.c; then echo $(srcdir)/lstat.c; else echo lstat.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lstat_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/long-options.c; then echo $(srcdir)/long-options.c; else echo long-options.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > long-options_.c || rm -f long-options_.c
 makepath_.c: makepath.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/makepath.c; then echo $(srcdir)/makepath.c; else echo makepath.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > makepath_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/makepath.c; then echo $(srcdir)/makepath.c; else echo makepath.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > makepath_.c || rm -f makepath_.c
 malloc_.c: malloc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/malloc.c; then echo $(srcdir)/malloc.c; else echo malloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > malloc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/malloc.c; then echo $(srcdir)/malloc.c; else echo malloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > malloc_.c || rm -f malloc_.c
 mbswidth_.c: mbswidth.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mbswidth.c; then echo $(srcdir)/mbswidth.c; else echo mbswidth.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mbswidth_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mbswidth.c; then echo $(srcdir)/mbswidth.c; else echo mbswidth.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mbswidth_.c || rm -f mbswidth_.c
 md5_.c: md5.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md5.c; then echo $(srcdir)/md5.c; else echo md5.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md5_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md5.c; then echo $(srcdir)/md5.c; else echo md5.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md5_.c || rm -f md5_.c
 memcasecmp_.c: memcasecmp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcasecmp.c; then echo $(srcdir)/memcasecmp.c; else echo memcasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcasecmp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcasecmp.c; then echo $(srcdir)/memcasecmp.c; else echo memcasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcasecmp_.c || rm -f memcasecmp_.c
 memchr_.c: memchr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c || rm -f memchr_.c
 memcmp_.c: memcmp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcmp.c; then echo $(srcdir)/memcmp.c; else echo memcmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcmp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcmp.c; then echo $(srcdir)/memcmp.c; else echo memcmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcmp_.c || rm -f memcmp_.c
 memcoll_.c: memcoll.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcoll.c; then echo $(srcdir)/memcoll.c; else echo memcoll.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcoll_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcoll.c; then echo $(srcdir)/memcoll.c; else echo memcoll.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcoll_.c || rm -f memcoll_.c
 memcpy_.c: memcpy.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcpy.c; then echo $(srcdir)/memcpy.c; else echo memcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcpy_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcpy.c; then echo $(srcdir)/memcpy.c; else echo memcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcpy_.c || rm -f memcpy_.c
 memmove_.c: memmove.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c || rm -f memmove_.c
 memrchr_.c: memrchr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memrchr.c; then echo $(srcdir)/memrchr.c; else echo memrchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memrchr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memrchr.c; then echo $(srcdir)/memrchr.c; else echo memrchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memrchr_.c || rm -f memrchr_.c
 memset_.c: memset.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c || rm -f memset_.c
 mkstemp_.c: mkstemp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkstemp.c; then echo $(srcdir)/mkstemp.c; else echo mkstemp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkstemp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkstemp.c; then echo $(srcdir)/mkstemp.c; else echo mkstemp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkstemp_.c || rm -f mkstemp_.c
 mktime_.c: mktime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c || rm -f mktime_.c
 modechange_.c: modechange.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/modechange.c; then echo $(srcdir)/modechange.c; else echo modechange.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > modechange_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/modechange.c; then echo $(srcdir)/modechange.c; else echo modechange.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > modechange_.c || rm -f modechange_.c
 mountlist_.c: mountlist.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mountlist.c; then echo $(srcdir)/mountlist.c; else echo mountlist.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mountlist_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mountlist.c; then echo $(srcdir)/mountlist.c; else echo mountlist.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mountlist_.c || rm -f mountlist_.c
 nanosleep_.c: nanosleep.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/nanosleep.c; then echo $(srcdir)/nanosleep.c; else echo nanosleep.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > nanosleep_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/nanosleep.c; then echo $(srcdir)/nanosleep.c; else echo nanosleep.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > nanosleep_.c || rm -f nanosleep_.c
 obstack_.c: obstack.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c || rm -f obstack_.c
 path-concat_.c: path-concat.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/path-concat.c; then echo $(srcdir)/path-concat.c; else echo path-concat.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > path-concat_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/path-concat.c; then echo $(srcdir)/path-concat.c; else echo path-concat.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > path-concat_.c || rm -f path-concat_.c
 physmem_.c: physmem.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/physmem.c; then echo $(srcdir)/physmem.c; else echo physmem.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > physmem_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/physmem.c; then echo $(srcdir)/physmem.c; else echo physmem.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > physmem_.c || rm -f physmem_.c
 posixtm_.c: posixtm.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/posixtm.c; then echo $(srcdir)/posixtm.c; else echo posixtm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > posixtm_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/posixtm.c; then echo $(srcdir)/posixtm.c; else echo posixtm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > posixtm_.c || rm -f posixtm_.c
 putenv_.c: putenv.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/putenv.c; then echo $(srcdir)/putenv.c; else echo putenv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > putenv_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/putenv.c; then echo $(srcdir)/putenv.c; else echo putenv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > putenv_.c || rm -f putenv_.c
 quote_.c: quote.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quote.c; then echo $(srcdir)/quote.c; else echo quote.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quote_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quote.c; then echo $(srcdir)/quote.c; else echo quote.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quote_.c || rm -f quote_.c
 quotearg_.c: quotearg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quotearg.c; then echo $(srcdir)/quotearg.c; else echo quotearg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quotearg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quotearg.c; then echo $(srcdir)/quotearg.c; else echo quotearg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quotearg_.c || rm -f quotearg_.c
 readtokens_.c: readtokens.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/readtokens.c; then echo $(srcdir)/readtokens.c; else echo readtokens.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > readtokens_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/readtokens.c; then echo $(srcdir)/readtokens.c; else echo readtokens.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > readtokens_.c || rm -f readtokens_.c
 readutmp_.c: readutmp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/readutmp.c; then echo $(srcdir)/readutmp.c; else echo readutmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > readutmp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/readutmp.c; then echo $(srcdir)/readutmp.c; else echo readutmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > readutmp_.c || rm -f readutmp_.c
 realloc_.c: realloc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/realloc.c; then echo $(srcdir)/realloc.c; else echo realloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > realloc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/realloc.c; then echo $(srcdir)/realloc.c; else echo realloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > realloc_.c || rm -f realloc_.c
 regex_.c: regex.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/regex.c; then echo $(srcdir)/regex.c; else echo regex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > regex_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/regex.c; then echo $(srcdir)/regex.c; else echo regex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > regex_.c || rm -f regex_.c
 rename_.c: rename.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rename.c; then echo $(srcdir)/rename.c; else echo rename.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rename_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rename.c; then echo $(srcdir)/rename.c; else echo rename.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rename_.c || rm -f rename_.c
 rmdir_.c: rmdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rmdir.c; then echo $(srcdir)/rmdir.c; else echo rmdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rmdir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rmdir.c; then echo $(srcdir)/rmdir.c; else echo rmdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rmdir_.c || rm -f rmdir_.c
 rpmatch_.c: rpmatch.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rpmatch.c; then echo $(srcdir)/rpmatch.c; else echo rpmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rpmatch_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rpmatch.c; then echo $(srcdir)/rpmatch.c; else echo rpmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rpmatch_.c || rm -f rpmatch_.c
 safe-read_.c: safe-read.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/safe-read.c; then echo $(srcdir)/safe-read.c; else echo safe-read.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > safe-read_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/safe-read.c; then echo $(srcdir)/safe-read.c; else echo safe-read.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > safe-read_.c || rm -f safe-read_.c
 same_.c: same.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/same.c; then echo $(srcdir)/same.c; else echo same.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > same_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/same.c; then echo $(srcdir)/same.c; else echo same.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > same_.c || rm -f same_.c
 save-cwd_.c: save-cwd.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/save-cwd.c; then echo $(srcdir)/save-cwd.c; else echo save-cwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > save-cwd_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/save-cwd.c; then echo $(srcdir)/save-cwd.c; else echo save-cwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > save-cwd_.c || rm -f save-cwd_.c
 savedir_.c: savedir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/savedir.c; then echo $(srcdir)/savedir.c; else echo savedir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > savedir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/savedir.c; then echo $(srcdir)/savedir.c; else echo savedir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > savedir_.c || rm -f savedir_.c
 sha_.c: sha.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sha.c; then echo $(srcdir)/sha.c; else echo sha.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sha_.c
-stat_.c: stat.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stat.c; then echo $(srcdir)/stat.c; else echo stat.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stat_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sha.c; then echo $(srcdir)/sha.c; else echo sha.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sha_.c || rm -f sha_.c
 stime_.c: stime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stime.c; then echo $(srcdir)/stime.c; else echo stime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stime.c; then echo $(srcdir)/stime.c; else echo stime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stime_.c || rm -f stime_.c
 stpcpy_.c: stpcpy.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c || rm -f stpcpy_.c
 strcasecmp_.c: strcasecmp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strcasecmp.c; then echo $(srcdir)/strcasecmp.c; else echo strcasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strcasecmp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strcasecmp.c; then echo $(srcdir)/strcasecmp.c; else echo strcasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strcasecmp_.c || rm -f strcasecmp_.c
 strcspn_.c: strcspn.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strcspn.c; then echo $(srcdir)/strcspn.c; else echo strcspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strcspn_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strcspn.c; then echo $(srcdir)/strcspn.c; else echo strcspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strcspn_.c || rm -f strcspn_.c
 strdup_.c: strdup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strdup_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strdup_.c || rm -f strdup_.c
 strftime_.c: strftime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strftime.c; then echo $(srcdir)/strftime.c; else echo strftime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strftime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strftime.c; then echo $(srcdir)/strftime.c; else echo strftime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strftime_.c || rm -f strftime_.c
 stripslash_.c: stripslash.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stripslash.c; then echo $(srcdir)/stripslash.c; else echo stripslash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stripslash_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stripslash.c; then echo $(srcdir)/stripslash.c; else echo stripslash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stripslash_.c || rm -f stripslash_.c
 strncasecmp_.c: strncasecmp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strncasecmp.c; then echo $(srcdir)/strncasecmp.c; else echo strncasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strncasecmp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strncasecmp.c; then echo $(srcdir)/strncasecmp.c; else echo strncasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strncasecmp_.c || rm -f strncasecmp_.c
 strndup_.c: strndup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c || rm -f strndup_.c
 strnlen_.c: strnlen.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c || rm -f strnlen_.c
 strpbrk_.c: strpbrk.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strpbrk_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strpbrk_.c || rm -f strpbrk_.c
 strstr_.c: strstr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strstr.c; then echo $(srcdir)/strstr.c; else echo strstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strstr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strstr.c; then echo $(srcdir)/strstr.c; else echo strstr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strstr_.c || rm -f strstr_.c
 strtod_.c: strtod.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtod.c; then echo $(srcdir)/strtod.c; else echo strtod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtod_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtod.c; then echo $(srcdir)/strtod.c; else echo strtod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtod_.c || rm -f strtod_.c
 strtol_.c: strtol.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtol.c; then echo $(srcdir)/strtol.c; else echo strtol.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtol_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtol.c; then echo $(srcdir)/strtol.c; else echo strtol.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtol_.c || rm -f strtol_.c
 strtoul_.c: strtoul.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoul.c; then echo $(srcdir)/strtoul.c; else echo strtoul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoul_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoul.c; then echo $(srcdir)/strtoul.c; else echo strtoul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoul_.c || rm -f strtoul_.c
 strtoull_.c: strtoull.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoull.c; then echo $(srcdir)/strtoull.c; else echo strtoull.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoull_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoull.c; then echo $(srcdir)/strtoull.c; else echo strtoull.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoull_.c || rm -f strtoull_.c
 strtoumax_.c: strtoumax.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoumax.c; then echo $(srcdir)/strtoumax.c; else echo strtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoumax_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strtoumax.c; then echo $(srcdir)/strtoumax.c; else echo strtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strtoumax_.c || rm -f strtoumax_.c
 strverscmp_.c: strverscmp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strverscmp.c; then echo $(srcdir)/strverscmp.c; else echo strverscmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strverscmp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strverscmp.c; then echo $(srcdir)/strverscmp.c; else echo strverscmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strverscmp_.c || rm -f strverscmp_.c
 tempname_.c: tempname.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tempname.c; then echo $(srcdir)/tempname.c; else echo tempname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tempname_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tempname.c; then echo $(srcdir)/tempname.c; else echo tempname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tempname_.c || rm -f tempname_.c
 unicodeio_.c: unicodeio.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/unicodeio.c; then echo $(srcdir)/unicodeio.c; else echo unicodeio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > unicodeio_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/unicodeio.c; then echo $(srcdir)/unicodeio.c; else echo unicodeio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > unicodeio_.c || rm -f unicodeio_.c
 userspec_.c: userspec.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/userspec.c; then echo $(srcdir)/userspec.c; else echo userspec.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > userspec_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/userspec.c; then echo $(srcdir)/userspec.c; else echo userspec.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > userspec_.c || rm -f userspec_.c
 utime_.c: utime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utime.c; then echo $(srcdir)/utime.c; else echo utime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > utime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utime.c; then echo $(srcdir)/utime.c; else echo utime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > utime_.c || rm -f utime_.c
 version-etc_.c: version-etc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/version-etc.c; then echo $(srcdir)/version-etc.c; else echo version-etc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > version-etc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/version-etc.c; then echo $(srcdir)/version-etc.c; else echo version-etc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > version-etc_.c || rm -f version-etc_.c
 xgetcwd_.c: xgetcwd.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xgetcwd.c; then echo $(srcdir)/xgetcwd.c; else echo xgetcwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xgetcwd_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xgetcwd.c; then echo $(srcdir)/xgetcwd.c; else echo xgetcwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xgetcwd_.c || rm -f xgetcwd_.c
 xgethostname_.c: xgethostname.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xgethostname.c; then echo $(srcdir)/xgethostname.c; else echo xgethostname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xgethostname_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xgethostname.c; then echo $(srcdir)/xgethostname.c; else echo xgethostname.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xgethostname_.c || rm -f xgethostname_.c
 xmalloc_.c: xmalloc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c || rm -f xmalloc_.c
 xstrdup_.c: xstrdup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrdup.c; then echo $(srcdir)/xstrdup.c; else echo xstrdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrdup_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrdup.c; then echo $(srcdir)/xstrdup.c; else echo xstrdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrdup_.c || rm -f xstrdup_.c
 xstrtod_.c: xstrtod.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtod.c; then echo $(srcdir)/xstrtod.c; else echo xstrtod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtod_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtod.c; then echo $(srcdir)/xstrtod.c; else echo xstrtod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtod_.c || rm -f xstrtod_.c
 xstrtol_.c: xstrtol.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtol.c; then echo $(srcdir)/xstrtol.c; else echo xstrtol.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtol_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtol.c; then echo $(srcdir)/xstrtol.c; else echo xstrtol.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtol_.c || rm -f xstrtol_.c
 xstrtoul_.c: xstrtoul.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoul.c; then echo $(srcdir)/xstrtoul.c; else echo xstrtoul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoul_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoul.c; then echo $(srcdir)/xstrtoul.c; else echo xstrtoul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoul_.c || rm -f xstrtoul_.c
 xstrtoumax_.c: xstrtoumax.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c || rm -f xstrtoumax_.c
 yesno_.c: yesno.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c || rm -f yesno_.c
 __fpending_.$(OBJEXT) addext_.$(OBJEXT) alloca_.$(OBJEXT) \
 argmatch_.$(OBJEXT) atexit_.$(OBJEXT) backupfile_.$(OBJEXT) \
 basename_.$(OBJEXT) canon-host_.$(OBJEXT) chown_.$(OBJEXT) \
@@ -559,35 +689,40 @@ getugroups_.$(OBJEXT) getusershell_.$(OB
 hard-locale_.$(OBJEXT) hash_.$(OBJEXT) human_.$(OBJEXT) \
 idcache_.$(OBJEXT) isdir_.$(OBJEXT) lchown_.$(OBJEXT) \
 linebuffer_.$(OBJEXT) localcharset_.$(OBJEXT) long-options_.$(OBJEXT) \
-lstat_.$(OBJEXT) makepath_.$(OBJEXT) malloc_.$(OBJEXT) \
-mbswidth_.$(OBJEXT) md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) \
-memchr_.$(OBJEXT) memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) \
-memcpy_.$(OBJEXT) memmove_.$(OBJEXT) memrchr_.$(OBJEXT) \
-memset_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \
-modechange_.$(OBJEXT) mountlist_.$(OBJEXT) nanosleep_.$(OBJEXT) \
-obstack_.$(OBJEXT) path-concat_.$(OBJEXT) physmem_.$(OBJEXT) \
-posixtm_.$(OBJEXT) putenv_.$(OBJEXT) quote_.$(OBJEXT) \
-quotearg_.$(OBJEXT) readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) \
-realloc_.$(OBJEXT) regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) \
-rpmatch_.$(OBJEXT) safe-read_.$(OBJEXT) same_.$(OBJEXT) \
-save-cwd_.$(OBJEXT) savedir_.$(OBJEXT) sha_.$(OBJEXT) stat_.$(OBJEXT) \
-stime_.$(OBJEXT) stpcpy_.$(OBJEXT) strcasecmp_.$(OBJEXT) \
-strcspn_.$(OBJEXT) strdup_.$(OBJEXT) strftime_.$(OBJEXT) \
-stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) strndup_.$(OBJEXT) \
-strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) strstr_.$(OBJEXT) \
-strtod_.$(OBJEXT) strtol_.$(OBJEXT) strtoul_.$(OBJEXT) \
-strtoull_.$(OBJEXT) strtoumax_.$(OBJEXT) strverscmp_.$(OBJEXT) \
-tempname_.$(OBJEXT) unicodeio_.$(OBJEXT) userspec_.$(OBJEXT) \
-utime_.$(OBJEXT) version-etc_.$(OBJEXT) xgetcwd_.$(OBJEXT) \
-xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) \
-xstrtod_.$(OBJEXT) xstrtol_.$(OBJEXT) xstrtoul_.$(OBJEXT) \
-xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : $(ANSI2KNR)
+makepath_.$(OBJEXT) malloc_.$(OBJEXT) mbswidth_.$(OBJEXT) \
+md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) memchr_.$(OBJEXT) \
+memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) memcpy_.$(OBJEXT) \
+memmove_.$(OBJEXT) memrchr_.$(OBJEXT) memset_.$(OBJEXT) \
+mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) modechange_.$(OBJEXT) \
+mountlist_.$(OBJEXT) nanosleep_.$(OBJEXT) obstack_.$(OBJEXT) \
+path-concat_.$(OBJEXT) physmem_.$(OBJEXT) posixtm_.$(OBJEXT) \
+putenv_.$(OBJEXT) quote_.$(OBJEXT) quotearg_.$(OBJEXT) \
+readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) realloc_.$(OBJEXT) \
+regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) rpmatch_.$(OBJEXT) \
+safe-read_.$(OBJEXT) same_.$(OBJEXT) save-cwd_.$(OBJEXT) \
+savedir_.$(OBJEXT) sha_.$(OBJEXT) stime_.$(OBJEXT) stpcpy_.$(OBJEXT) \
+strcasecmp_.$(OBJEXT) strcspn_.$(OBJEXT) strdup_.$(OBJEXT) \
+strftime_.$(OBJEXT) stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) \
+strndup_.$(OBJEXT) strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) \
+strstr_.$(OBJEXT) strtod_.$(OBJEXT) strtol_.$(OBJEXT) \
+strtoul_.$(OBJEXT) strtoull_.$(OBJEXT) strtoumax_.$(OBJEXT) \
+strverscmp_.$(OBJEXT) tempname_.$(OBJEXT) unicodeio_.$(OBJEXT) \
+userspec_.$(OBJEXT) utime_.$(OBJEXT) version-etc_.$(OBJEXT) \
+xgetcwd_.$(OBJEXT) xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) \
+xstrdup_.$(OBJEXT) xstrtod_.$(OBJEXT) xstrtol_.$(OBJEXT) \
+xstrtoul_.$(OBJEXT) xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : \
+$(ANSI2KNR)
+
 .y.c:
-	$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c
+	$(YACCCOMPILE) $< && mv y.tab.c $@
 	if test -f y.tab.h; then \
-	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-	else :; fi
-
+	  if cmp -s y.tab.h $*.h; then \
+	    rm -f y.tab.h; \
+	  else \
+	    mv y.tab.h $*.h; \
+	  fi; \
+	fi
+uninstall-info-am:
 
 tags: TAGS
 
@@ -600,7 +735,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -616,144 +751,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPE
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/__fpending.Po
-@AMDEP@@_am_include@ $(DEPDIR)/addext$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/alloca.Po
-@AMDEP@@_am_include@ $(DEPDIR)/argmatch$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/atexit.Po
-@AMDEP@@_am_include@ $(DEPDIR)/backupfile$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/basename$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/canon-host$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/chown.Po
-@AMDEP@@_am_include@ $(DEPDIR)/closeout$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/diacrit$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dirname$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dup-safer$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dup2.Po
-@AMDEP@@_am_include@ $(DEPDIR)/error.Po
-@AMDEP@@_am_include@ $(DEPDIR)/euidaccess.Po
-@AMDEP@@_am_include@ $(DEPDIR)/exclude$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/fileblocks.Po
-@AMDEP@@_am_include@ $(DEPDIR)/filemode$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/fnmatch.Po
-@AMDEP@@_am_include@ $(DEPDIR)/fopen-safer$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/fsusage.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ftruncate.Po
-@AMDEP@@_am_include@ $(DEPDIR)/full-write$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getdate$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getgroups.Po
-@AMDEP@@_am_include@ $(DEPDIR)/gethostname.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getline.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getloadavg.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getopt$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getopt1$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getpass.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getstr$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getugroups$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getusershell.Po
-@AMDEP@@_am_include@ $(DEPDIR)/group-member.Po
-@AMDEP@@_am_include@ $(DEPDIR)/hard-locale$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/hash$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/human$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/idcache$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/isdir$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/lchown.Po
-@AMDEP@@_am_include@ $(DEPDIR)/linebuffer$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/localcharset$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/long-options$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/lstat.Po
-@AMDEP@@_am_include@ $(DEPDIR)/makepath$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/malloc.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mbswidth$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/md5$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memcasecmp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memchr.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memcmp.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memcoll$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memcpy.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memmove.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memrchr.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memset.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mkstemp.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mktime.Po
-@AMDEP@@_am_include@ $(DEPDIR)/modechange$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mountlist.Po
-@AMDEP@@_am_include@ $(DEPDIR)/nanosleep.Po
-@AMDEP@@_am_include@ $(DEPDIR)/obstack.Po
-@AMDEP@@_am_include@ $(DEPDIR)/path-concat$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/physmem$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/posixtm$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/putenv.Po
-@AMDEP@@_am_include@ $(DEPDIR)/quote$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/quotearg$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/readtokens$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/readutmp.Po
-@AMDEP@@_am_include@ $(DEPDIR)/realloc.Po
-@AMDEP@@_am_include@ $(DEPDIR)/regex.Po
-@AMDEP@@_am_include@ $(DEPDIR)/rename.Po
-@AMDEP@@_am_include@ $(DEPDIR)/rmdir.Po
-@AMDEP@@_am_include@ $(DEPDIR)/rpmatch.Po
-@AMDEP@@_am_include@ $(DEPDIR)/safe-read$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/same$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/save-cwd$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/savedir$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/sha$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/stat.Po
-@AMDEP@@_am_include@ $(DEPDIR)/stime.Po
-@AMDEP@@_am_include@ $(DEPDIR)/stpcpy.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strcasecmp.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strcspn.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strdup.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strftime.Po
-@AMDEP@@_am_include@ $(DEPDIR)/stripslash$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strncasecmp.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strndup.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strnlen.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strpbrk.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strstr.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strtod.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strtol.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strtoul.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strtoull.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strtoumax.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strverscmp.Po
-@AMDEP@@_am_include@ $(DEPDIR)/tempname.Po
-@AMDEP@@_am_include@ $(DEPDIR)/unicodeio$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/userspec$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/utime.Po
-@AMDEP@@_am_include@ $(DEPDIR)/version-etc$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xgetcwd$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xgethostname$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xmalloc$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xstrdup$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xstrtod$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xstrtol$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xstrtoul$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/xstrtoumax$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/yesno$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -762,7 +763,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -787,26 +792,23 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
-	-test -z "getdate.c$(BUILT_SOURCES)$(MAINTAINERCLEANFILES)" || rm -f getdate.c $(BUILT_SOURCES) $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)$(MAINTAINERCLEANFILES)" || rm -f $(BUILT_SOURCES) $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
@@ -816,11 +818,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -828,7 +830,7 @@ install-data-am:
 
 install-exec-am: install-exec-local
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -842,18 +844,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-info-am uninstall-local
 
-.PHONY: all all-am all-local check check-am clean clean-generic \
+.PHONY: GTAGS all all-am all-local check check-am clean clean-generic \
 	clean-noinstLIBRARIES distclean distclean-compile \
 	distclean-depend distclean-generic distclean-tags distdir dvi \
 	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-exec-local \
-	install-info install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
-	uninstall-local
+	uninstall-info-am uninstall-local
 
 lstat.c: xstat.in
 	sed \
@@ -861,8 +863,8 @@ lstat.c: xstat.in
 	  -e 's/@xstat@/lstat/g' \
 	  -e '/_LSTAT_ONLY@/d' \
 	  -e '/@BEGIN_STAT_ONLY@/,/@END_STAT_ONLY@/d' \
-	  $(srcdir)/xstat.in > $@-t
-	mv $@-t $@
+	  $(srcdir)/xstat.in > t-$@
+	mv t-$@ $@
 
 stat.c: xstat.in
 	sed \
@@ -870,8 +872,8 @@ stat.c: xstat.in
 	  -e 's/@xstat@/stat/g' \
 	  -e '/_STAT_ONLY@/d' \
 	  -e '/@BEGIN_LSTAT_ONLY@/,/@END_LSTAT_ONLY@/d' \
-	  $(srcdir)/xstat.in > $@-t
-	mv $@-t $@
+	  $(srcdir)/xstat.in > t-$@
+	mv t-$@ $@
 
 # The following is needed in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
@@ -911,9 +913,8 @@ charset.alias: config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
 	mv t-$@ $@
 .sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > $@-t
-	mv $@-t $@
-
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+	mv t-$@ $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/addext.c	2000-08-07 17:01:54.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/addext.c	2002-06-11 13:41:44.000000000 +0000
@@ -22,6 +22,11 @@
 # include <config.h>
 #endif
 
+/* Richard Dawe <rich@phekda.freeserve.co.uk>: Cope with MS-DOSisms. */
+#ifdef MSDOS
+#define HAVE_DOS_FILE_NAMES 1
+#endif /* MSDOS */
+
 #ifndef HAVE_DOS_FILE_NAMES
 # define HAVE_DOS_FILE_NAMES 0
 #endif
@@ -82,15 +87,64 @@ addext (char *filename, char const *ext,
     {
       /* Live within DOS's 8.3 limit.  */
       char *dot = strchr (s, '.');
+      size_t s_ext_len = 0;	/* length of existing extension in `s' */
+
       if (dot)
+	s_ext_len = slen - (dot + 1 - s);
+      else if (ext[0] == '.')
 	{
-	  slen -= dot + 1 - s;
-	  s = dot + 1;
-	  slen_max = 3;
+	  s[slen++] = '.';
+	  s[slen] = '\0';
+	  dot = s + slen - 1;
+	}
+
+      /* DOS doesn't allow more than a single dot.  */
+      if (ext[0] == '.')
+	{
+	  ext++;
+	  extlen--;
+	}
+
+      /* If EXT is "~N~" and there's not enough space to append it,
+	 lose the leading `~' so that we could salvage more of the
+	 original name ("foo.c" + ".~9~" -> "foo.c9~").  */
+      if (s_ext_len + extlen > 3 && ext[0] == '~' && extlen > 1)
+	{
+	  ext++;
+	  extlen--;
+	}
+      /* If there isn't enough space in the extension to append
+	 EXT, use the base part ("foo.c" + ".~99~" -> "foo99~").  */
+      if (!dot || extlen > 3)
+	{
+	  slen_max = 8;
+	  if (dot)
+	    slen = dot - s;
+	  if (extlen < slen_max)
+	    {
+	      if (slen + extlen > slen_max)
+		slen = slen_max - extlen;
+	    }
+	  /* Else give up and force using E.  We don't allow EXT to
+	     eat up all of the original filename's characters.  That
+	     is, "foo" + ".~3456789~" should NOT yield "3456789~".  */
+	  else if (dot)
+	    {
+	      slen_max = 3;
+	      extlen = 4;
+	      s = dot + 1;
+	      slen = s_ext_len;
+	    }
 	}
       else
-	slen_max = 8;
-      extlen = 9; /* Don't use EXT.  */
+	{
+	  /* Extension has enough space to append EXT.  */
+	  slen_max = 3;
+	  slen = s_ext_len;
+	  s = dot + 1;
+	  if (slen + extlen > slen_max)
+	    slen = slen_max - extlen;
+	}
     }
 
   if (slen + extlen <= slen_max)
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/backupfile.c	2000-02-27 18:02:18.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/backupfile.c	2002-06-11 13:41:44.000000000 +0000
@@ -23,6 +23,28 @@
 # include <config.h>
 #endif
 
+/* Richard Dawe <rich@phekda.freeserve.co.uk>: Cope with MS-DOSisms. */
+#ifdef MSDOS
+#define HAVE_DOS_FILE_NAMES 1
+
+#define filename_char_eq(c1,c2)				\
+    ({int _c1 = (c1), _c2 = (c2); 			\
+    (_c1 >= 'A' &&  _c1 <= 'Z' ? tolower(_c1) : _c1) ==	\
+    (_c2 >= 'A' &&  _c2 <= 'Z' ? tolower(_c2) : _c2);	\
+    })
+     
+#endif /* MSDOS */
+
+#ifndef HAVE_DOS_FILE_NAMES
+#define HAVE_DOS_FILE_NAMES 0
+#endif
+
+#ifndef filename_char_eq
+#define filename_char_eq(c1,c2)  ((c1) == (c2))
+#else
+#include <ctype.h>
+#endif
+
 #include <argmatch.h>
 #include <backupfile.h>
 
@@ -190,7 +212,11 @@ max_backup_version (const char *file, co
 
   while ((dp = readdir (dirp)) != 0)
     {
-      if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) < file_name_length + 4)
+      if (!REAL_DIR_ENTRY (dp)
+	  /* Under DOS 8+3 file name limits, backup extensions
+	     may consume part of the original name.  */
+	  || (! HAVE_DOS_FILE_NAMES && NLENGTH (dp) < file_name_length + 4)
+	  || NLENGTH (dp) < file_name_length)
 	continue;
 
       this_version = version_number (file, dp->d_name, file_name_length);
@@ -210,18 +236,30 @@ static int
 version_number (const char *base, const char *backup, size_t base_length)
 {
   int version;
-  const char *p;
+  const char *s = base;
+  const char *s_end = base + base_length;
+  const char *p = backup;
 
   version = 0;
-  if (strncmp (base, backup, base_length) == 0
-      && backup[base_length] == '.'
-      && backup[base_length + 1] == '~')
-    {
-      for (p = &backup[base_length + 2]; ISDIGIT (*p); ++p)
-	version = version * 10 + *p - '0';
-      if (p[0] != '~' || p[1])
-	version = 0;
-    }
+
+  /* This could use `strncmp', but under HAVE_DOS_FILE_NAMES the two
+     files need not compare equal to the full extent of BASE_LENGTH.  */
+  if (! filename_char_eq (*p, *s))
+    return 0;
+  for ( ; s < s_end && filename_char_eq (*p, *s); p++, s++)
+    ;
+  if (p[0] == '.' && p[1] == '~')
+    p += 2;
+  else if (! HAVE_DOS_FILE_NAMES)
+    return 0;
+  else if (*p == '.')	/* the case of foo.99~ vs foo.c */
+    p++;
+
+  for ( ; ISDIGIT (*p); ++p)
+    version = version * 10 + *p - '0';
+  if (p[0] != '~' || p[1])
+    version = 0;
+
   return version;
 }
 #endif /* HAVE_DIR */
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/basename.c	2001-01-16 08:16:34.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/basename.c	2002-06-11 13:41:44.000000000 +0000
@@ -22,6 +22,15 @@
 #include <stdio.h>
 #include <assert.h>
 
+/* Richard Dawe <rich@phekda.freeserve.co.uk>: Cope with MS-DOSisms. */
+#ifdef MSDOS
+# undef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) \
+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
+# undef ISSLASH
+# define ISSLASH(c) (((c) == '/') || ((c) == '\\'))
+#endif /* MSDOS */
+
 #ifndef FILESYSTEM_PREFIX_LEN
 # define FILESYSTEM_PREFIX_LEN(Filename) 0
 #endif
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/dirname.c	2000-12-08 08:20:48.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/dirname.c	2002-12-03 16:24:56.000000000 +0000
@@ -43,6 +43,15 @@ void *memrchr ();
 
 #include "dirname.h"
 
+/* Richard Dawe <rich@phekda.freeserve.co.uk>: Cope with MS-DOSisms. */
+#ifdef MSDOS
+# undef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) \
+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
+# undef ISSLASH
+# define ISSLASH(c) (((c) == '/') || ((c) == '\\'))
+#endif /* MSDOS */
+
 #ifndef FILESYSTEM_PREFIX_LEN
 # define FILESYSTEM_PREFIX_LEN(Filename) 0
 #endif
@@ -133,11 +142,17 @@ dir_name (char const *path)
 {
   char const *result;
   size_t length = dir_name_r (path, &result);
-  int append_dot = (length && length == FILESYSTEM_PREFIX_LEN (newpath));
-  char *newpath = (char *) malloc (length + append_dot + 1);
+  int append_dot;
+  char *newpath;
+
+  /* Richard Dawe <rich@phekda.freeserve.co.uk>: Always allocate space
+   * for appending a dot, so that we avoid append_dot's initialisation
+   * depending on newpath and vice-versa. */
+  newpath = (char *) malloc (length + 1 /*append_dot*/ + 1);
   if (newpath == 0)
     return 0;
   strncpy (newpath, result, length);
+  append_dot = (length && length == FILESYSTEM_PREFIX_LEN (newpath));
   /* If PATH is "d:foo", return "d:.", the CWD on drive d:  */
   if (append_dot)
     newpath[length++] = '.';
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/euidaccess.c	2000-02-27 17:52:00.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/euidaccess.c	2002-06-11 13:41:44.000000000 +0000
@@ -155,6 +155,7 @@ euidaccess (const char *path, int mode)
     return access (path, mode);
 #endif
 
+#ifndef MSDOS
   if (stat (path, &stats))
     return -1;
 
@@ -192,6 +193,7 @@ euidaccess (const char *path, int mode)
     return 0;
   __set_errno (EACCESS);
   return -1;
+#endif /* !MSDOS */
 }
 #undef euidaccess
 #ifdef weak_alias
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/getdate.c	2001-04-08 20:00:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/getdate.c	2002-06-11 15:43:58.000000000 +0000
@@ -1,25 +1,24 @@
-
-/*  A Bison parser, made from getdate.y
-    by GNU Bison version 1.28  */
+/* A Bison parser, made from getdate.y
+   by GNU bison 1.35.  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
-#define	tAGO	257
-#define	tDST	258
-#define	tDAY	259
-#define	tDAY_UNIT	260
-#define	tDAYZONE	261
-#define	tHOUR_UNIT	262
-#define	tLOCAL_ZONE	263
-#define	tMERIDIAN	264
-#define	tMINUTE_UNIT	265
-#define	tMONTH	266
-#define	tMONTH_UNIT	267
-#define	tSEC_UNIT	268
-#define	tYEAR_UNIT	269
-#define	tZONE	270
-#define	tSNUMBER	271
-#define	tUNUMBER	272
+# define	tAGO	257
+# define	tDST	258
+# define	tDAY	259
+# define	tDAY_UNIT	260
+# define	tDAYZONE	261
+# define	tHOUR_UNIT	262
+# define	tLOCAL_ZONE	263
+# define	tMERIDIAN	264
+# define	tMINUTE_UNIT	265
+# define	tMONTH	266
+# define	tMONTH_UNIT	267
+# define	tSEC_UNIT	268
+# define	tYEAR_UNIT	269
+# define	tZONE	270
+# define	tSNUMBER	271
+# define	tUNUMBER	272
 
 #line 1 "getdate.y"
 
@@ -187,17 +186,17 @@ static int yylex ();
 
 
 #line 172 "getdate.y"
+#ifndef YYSTYPE
 typedef union
 {
   int intval;
   textint textintval;
-} YYSTYPE;
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
+} yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
+#ifndef YYDEBUG
+# define YYDEBUG 0
 #endif
 
 
@@ -206,167 +205,192 @@ typedef union
 #define	YYFLAG		-32768
 #define	YYNTBASE	22
 
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
 #define YYTRANSLATE(x) ((unsigned)(x) <= 272 ? yytranslate[x] : 33)
 
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,    20,     2,     2,    21,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    19,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     1,     4,     6,     8,    10,    12,    14,    16,    18,
-    21,    26,    31,    38,    45,    47,    50,    52,    54,    57,
-    59,    62,    65,    69,    75,    79,    83,    86,    91,    94,
-    98,   101,   103,   106,   109,   111,   114,   117,   119,   122,
-   125,   127,   130,   133,   135,   138,   141,   143,   146,   149,
-   151,   153,   154
-};
-
-static const short yyrhs[] = {    -1,
-    22,    23,     0,    24,     0,    25,     0,    26,     0,    28,
-     0,    27,     0,    29,     0,    31,     0,    18,    10,     0,
-    18,    19,    18,    32,     0,    18,    19,    18,    17,     0,
-    18,    19,    18,    19,    18,    32,     0,    18,    19,    18,
-    19,    18,    17,     0,     9,     0,     9,     4,     0,    16,
-     0,     7,     0,    16,     4,     0,     5,     0,     5,    20,
-     0,    18,     5,     0,    18,    21,    18,     0,    18,    21,
-    18,    21,    18,     0,    18,    17,    17,     0,    18,    12,
-    17,     0,    12,    18,     0,    12,    18,    20,    18,     0,
-    18,    12,     0,    18,    12,    18,     0,    30,     3,     0,
-    30,     0,    18,    15,     0,    17,    15,     0,    15,     0,
-    18,    13,     0,    17,    13,     0,    13,     0,    18,     6,
-     0,    17,     6,     0,     6,     0,    18,     8,     0,    17,
-     8,     0,     8,     0,    18,    11,     0,    17,    11,     0,
-    11,     0,    18,    14,     0,    17,    14,     0,    14,     0,
-    18,     0,     0,    10,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   189,   191,   194,   197,   199,   201,   203,   205,   207,   210,
-   218,   225,   233,   240,   251,   254,   258,   261,   263,   267,
-   273,   278,   285,   291,   311,   318,   326,   331,   337,   342,
-   350,   360,   363,   366,   368,   370,   372,   374,   376,   378,
-   380,   382,   384,   386,   388,   390,   392,   394,   396,   398,
-   402,   438,   441
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","tAGO","tDST",
-"tDAY","tDAY_UNIT","tDAYZONE","tHOUR_UNIT","tLOCAL_ZONE","tMERIDIAN","tMINUTE_UNIT",
-"tMONTH","tMONTH_UNIT","tSEC_UNIT","tYEAR_UNIT","tZONE","tSNUMBER","tUNUMBER",
-"':'","','","'/'","spec","item","time","local_zone","zone","day","date","rel",
-"relunit","number","o_merid", NULL
-};
-#endif
-
-static const short yyr1[] = {     0,
-    22,    22,    23,    23,    23,    23,    23,    23,    23,    24,
-    24,    24,    24,    24,    25,    25,    26,    26,    26,    27,
-    27,    27,    28,    28,    28,    28,    28,    28,    28,    28,
-    29,    29,    30,    30,    30,    30,    30,    30,    30,    30,
-    30,    30,    30,    30,    30,    30,    30,    30,    30,    30,
-    31,    32,    32
-};
-
-static const short yyr2[] = {     0,
-     0,     2,     1,     1,     1,     1,     1,     1,     1,     2,
-     4,     4,     6,     6,     1,     2,     1,     1,     2,     1,
-     2,     2,     3,     5,     3,     3,     2,     4,     2,     3,
-     2,     1,     2,     2,     1,     2,     2,     1,     2,     2,
-     1,     2,     2,     1,     2,     2,     1,     2,     2,     1,
-     1,     0,     1
-};
-
-static const short yydefact[] = {     1,
-     0,    20,    41,    18,    44,    15,    47,     0,    38,    50,
-    35,    17,     0,    51,     2,     3,     4,     5,     7,     6,
-     8,    32,     9,    21,    16,    27,    19,    40,    43,    46,
-    37,    49,    34,    22,    39,    42,    10,    45,    29,    36,
-    48,    33,     0,     0,     0,    31,     0,    26,    30,    25,
-    52,    23,    28,    53,    12,     0,    11,     0,    52,    24,
-    14,    13,     0,     0
-};
-
-static const short yydefgoto[] = {     1,
-    15,    16,    17,    18,    19,    20,    21,    22,    23,    57
-};
-
-static const short yypact[] = {-32768,
-     0,     1,-32768,-32768,-32768,    19,-32768,   -14,-32768,-32768,
--32768,    32,    26,    14,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,    27,-32768,-32768,-32768,    22,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -16,-32768,
--32768,-32768,    29,    25,    30,-32768,    31,-32768,-32768,-32768,
-    28,    23,-32768,-32768,-32768,    33,-32768,    34,    -7,-32768,
--32768,-32768,    50,-32768
+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+static const char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    20,     2,     2,    21,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    19,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18
+};
+
+#if YYDEBUG
+static const short yyprhs[] =
+{
+       0,     0,     1,     4,     6,     8,    10,    12,    14,    16,
+      18,    21,    26,    31,    38,    45,    47,    50,    52,    54,
+      57,    59,    62,    65,    69,    75,    79,    83,    86,    91,
+      94,    98,   101,   103,   106,   109,   111,   114,   117,   119,
+     122,   125,   127,   130,   133,   135,   138,   141,   143,   146,
+     149,   151,   153,   154
+};
+static const short yyrhs[] =
+{
+      -1,    22,    23,     0,    24,     0,    25,     0,    26,     0,
+      28,     0,    27,     0,    29,     0,    31,     0,    18,    10,
+       0,    18,    19,    18,    32,     0,    18,    19,    18,    17,
+       0,    18,    19,    18,    19,    18,    32,     0,    18,    19,
+      18,    19,    18,    17,     0,     9,     0,     9,     4,     0,
+      16,     0,     7,     0,    16,     4,     0,     5,     0,     5,
+      20,     0,    18,     5,     0,    18,    21,    18,     0,    18,
+      21,    18,    21,    18,     0,    18,    17,    17,     0,    18,
+      12,    17,     0,    12,    18,     0,    12,    18,    20,    18,
+       0,    18,    12,     0,    18,    12,    18,     0,    30,     3,
+       0,    30,     0,    18,    15,     0,    17,    15,     0,    15,
+       0,    18,    13,     0,    17,    13,     0,    13,     0,    18,
+       6,     0,    17,     6,     0,     6,     0,    18,     8,     0,
+      17,     8,     0,     8,     0,    18,    11,     0,    17,    11,
+       0,    11,     0,    18,    14,     0,    17,    14,     0,    14,
+       0,    18,     0,     0,    10,     0
+};
+
+#endif
+
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
+{
+       0,   189,   191,   194,   197,   199,   201,   203,   205,   207,
+     210,   218,   225,   233,   240,   251,   254,   258,   261,   263,
+     267,   273,   278,   285,   291,   311,   318,   326,   331,   337,
+     342,   350,   360,   363,   366,   368,   370,   372,   374,   376,
+     378,   380,   382,   384,   386,   388,   390,   392,   394,   396,
+     398,   402,   438,   441
 };
+#endif
 
-static const short yypgoto[] = {-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    -6
+
+#if (YYDEBUG) || defined YYERROR_VERBOSE
+
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
+static const char *const yytname[] =
+{
+  "$", "error", "$undefined.", "tAGO", "tDST", "tDAY", "tDAY_UNIT", 
+  "tDAYZONE", "tHOUR_UNIT", "tLOCAL_ZONE", "tMERIDIAN", "tMINUTE_UNIT", 
+  "tMONTH", "tMONTH_UNIT", "tSEC_UNIT", "tYEAR_UNIT", "tZONE", "tSNUMBER", 
+  "tUNUMBER", "':'", "','", "'/'", "spec", "item", "time", "local_zone", 
+  "zone", "day", "date", "rel", "relunit", "number", "o_merid", 0
+};
+#endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const short yyr1[] =
+{
+       0,    22,    22,    23,    23,    23,    23,    23,    23,    23,
+      24,    24,    24,    24,    24,    25,    25,    26,    26,    26,
+      27,    27,    27,    28,    28,    28,    28,    28,    28,    28,
+      28,    29,    29,    30,    30,    30,    30,    30,    30,    30,
+      30,    30,    30,    30,    30,    30,    30,    30,    30,    30,
+      30,    31,    32,    32
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const short yyr2[] =
+{
+       0,     0,     2,     1,     1,     1,     1,     1,     1,     1,
+       2,     4,     4,     6,     6,     1,     2,     1,     1,     2,
+       1,     2,     2,     3,     5,     3,     3,     2,     4,     2,
+       3,     2,     1,     2,     2,     1,     2,     2,     1,     2,
+       2,     1,     2,     2,     1,     2,     2,     1,     2,     2,
+       1,     1,     0,     1
+};
+
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+   doesn't specify something else to do.  Zero means the default is an
+   error. */
+static const short yydefact[] =
+{
+       1,     0,    20,    41,    18,    44,    15,    47,     0,    38,
+      50,    35,    17,     0,    51,     2,     3,     4,     5,     7,
+       6,     8,    32,     9,    21,    16,    27,    19,    40,    43,
+      46,    37,    49,    34,    22,    39,    42,    10,    45,    29,
+      36,    48,    33,     0,     0,     0,    31,     0,    26,    30,
+      25,    52,    23,    28,    53,    12,     0,    11,     0,    52,
+      24,    14,    13,     0,     0
+};
+
+static const short yydefgoto[] =
+{
+       1,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      57
+};
+
+static const short yypact[] =
+{
+  -32768,     0,     1,-32768,-32768,-32768,    19,-32768,   -14,-32768,
+  -32768,-32768,    32,    26,    14,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,    27,-32768,-32768,-32768,    22,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -16,
+  -32768,-32768,-32768,    29,    25,    30,-32768,    31,-32768,-32768,
+  -32768,    28,    23,-32768,-32768,-32768,    33,-32768,    34,    -7,
+  -32768,-32768,-32768,    50,-32768
+};
+
+static const short yypgoto[] =
+{
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+      -6
 };
 
 
 #define	YYLAST		53
 
 
-static const short yytable[] = {    63,
-    48,    49,    54,    26,     2,     3,     4,     5,     6,    61,
-     7,     8,     9,    10,    11,    12,    13,    14,    34,    35,
-    24,    36,    25,    37,    38,    39,    40,    41,    42,    46,
-    43,    28,    44,    29,    45,    27,    30,    54,    31,    32,
-    33,    47,    51,    58,    55,    50,    56,    52,    53,    64,
-    59,    60,    62
-};
-
-static const short yycheck[] = {     0,
-    17,    18,    10,    18,     5,     6,     7,     8,     9,    17,
-    11,    12,    13,    14,    15,    16,    17,    18,     5,     6,
-    20,     8,     4,    10,    11,    12,    13,    14,    15,     3,
-    17,     6,    19,     8,    21,     4,    11,    10,    13,    14,
-    15,    20,    18,    21,    17,    17,    19,    18,    18,     0,
-    18,    18,    59
+static const short yytable[] =
+{
+      63,    48,    49,    54,    26,     2,     3,     4,     5,     6,
+      61,     7,     8,     9,    10,    11,    12,    13,    14,    34,
+      35,    24,    36,    25,    37,    38,    39,    40,    41,    42,
+      46,    43,    28,    44,    29,    45,    27,    30,    54,    31,
+      32,    33,    47,    51,    58,    55,    50,    56,    52,    53,
+      64,    59,    60,    62
+};
+
+static const short yycheck[] =
+{
+       0,    17,    18,    10,    18,     5,     6,     7,     8,     9,
+      17,    11,    12,    13,    14,    15,    16,    17,    18,     5,
+       6,    20,     8,     4,    10,    11,    12,    13,    14,    15,
+       3,    17,     6,    19,     8,    21,     4,    11,    10,    13,
+      14,    15,    20,    18,    21,    17,    17,    19,    18,    18,
+       0,    18,    18,    59
 };
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison/bison.simple"
-/* This file comes from bison-1.28.  */
+#line 3 "c:/djgpp/lib/bison.sim"
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -388,62 +412,131 @@ static const short yycheck[] = {     0,
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
+/* This is the parser code that is written into each bison parser when
+   the %semantic_parser declaration is not specified in the grammar.
+   It was written by Richard Stallman by simplifying the hairy parser
+   used when %semantic_parser is specified.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+# if YYLSP_NEEDED
+  YYLTYPE yyls;
+# endif
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# if YYLSP_NEEDED
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
+      + 2 * YYSTACK_GAP_MAX)
+# else
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAX)
+# endif
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
 
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
 #endif
 
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
@@ -452,131 +545,161 @@ static const short yycheck[] = {     0,
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT 	goto yyabortlab
 #define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
 #define YYFAIL		goto yyerrlab
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
       yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+    { 								\
+      yyerror ("syntax error: cannot back up");			\
+      YYERROR;							\
+    }								\
 while (0)
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
 
-/* If nonreentrant, generate the variables here */
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).
 
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
+   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+   first token.  By default, to implement support for ranges, extend
+   its range to the last symbol.  */
+
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
+   Current.last_line   = Rhs[N].last_line;	\
+   Current.last_column = Rhs[N].last_column;
 #endif
 
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
 
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#if YYPURE
+# if YYLSP_NEEDED
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval, &yylloc)
+#  endif
+# else /* !YYLSP_NEEDED */
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval)
+#  endif
+# endif /* !YYLSP_NEEDED */
+#else /* !YYPURE */
+# define YYLEX			yylex ()
+#endif /* !YYPURE */
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+#endif /* !YYDEBUG */
 
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
+# undef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
 
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+#ifdef YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  while (*yys++ != '\0')
+    continue;
+
+  return yys - yystr - 1;
 }
+#  endif
+# endif
 
-#else /* __cplusplus */
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
+{
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  return yyd - 1;
 }
-
-#endif
+#  endif
+# endif
 #endif
 
-#line 217 "/usr/share/bison/bison.simple"
+#line 315 "c:/djgpp/lib/bison.sim"
+
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -585,76 +708,121 @@ __yy_memcpy (char *to, char *from, unsig
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
+# else
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+# endif
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
 
 /* Prevent warning if -Wstrict-prototypes.  */
 #ifdef __GNUC__
-#ifdef YYPARSE_PARAM
+# ifdef YYPARSE_PARAM
 int yyparse (void *);
-#else
+# else
 int yyparse (void);
+# endif
 #endif
+
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+#define YY_DECL_NON_LSP_VARIABLES			\
+/* The lookahead symbol.  */				\
+int yychar;						\
+							\
+/* The semantic value of the lookahead symbol. */	\
+YYSTYPE yylval;						\
+							\
+/* Number of parse errors so far.  */			\
+int yynerrs;
+
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES			\
+						\
+/* Location data for the lookahead symbol.  */	\
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES
 #endif
 
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
 int
-yyparse(YYPARSE_PARAM_ARG)
+yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yychar1 = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack. */
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
   register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
 
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
 
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+#if YYLSP_NEEDED
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
+#endif
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#if YYLSP_NEEDED
+# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 #else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+# define YYPOPSTACK   (yyvsp--, yyssp--)
 #endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
 
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+#if YYLSP_NEEDED
+  YYLTYPE yyloc;
+#endif
 
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule. */
   int yylen;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -666,110 +834,110 @@ yyparse(YYPARSE_PARAM_ARG)
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp = yyls;
 #endif
+  goto yysetstate;
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
-  *++yyssp = yystate;
+ yysetstate:
+  *yyssp = yystate;
 
   if (yyssp >= yyss + yystacksize - 1)
     {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short *yyss1 = yyss;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  */
+# if YYLSP_NEEDED
+	YYLTYPE *yyls1 = yyls;
+	/* This used to be a conditional around just the two extra args,
+	   but that might be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yyls1, yysize * sizeof (*yylsp),
+		    &yystacksize);
+	yyls = yyls1;
+# else
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+# endif
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
+	goto yyoverflowlab;
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+	short *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyoverflowlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+# if YYLSP_NEEDED
+	YYSTACK_RELOCATE (yyls);
+# endif
+# undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+#if YYLSP_NEEDED
+      yylsp = yyls + yysize - 1;
 #endif
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
 
       if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
@@ -788,10 +956,7 @@ yynewstate:
 
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
@@ -802,25 +967,25 @@ yynewstate:
       yychar1 = 0;
       yychar = YYEOF;		/* Don't call YYLEX any more */
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
+      yychar1 = YYTRANSLATE (yychar);
 
-#if YYDEBUG != 0
+#if YYDEBUG
+     /* We have to keep this `#if YYDEBUG', since we use variables
+	which are defined only if `YYDEBUG' is set.  */
       if (yydebug)
 	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
+	  YYFPRINTF (stderr, "Next token is %d (%s",
+		     yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise
+	     meaning of a token, for further debugging info.  */
+# ifdef YYPRINT
 	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
+# endif
+	  YYFPRINTF (stderr, ")\n");
 	}
 #endif
     }
@@ -852,56 +1017,78 @@ yynewstate:
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+	      yychar, yytname[yychar1]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
+
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-#if YYDEBUG != 0
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+#if YYLSP_NEEDED
+  /* Similarly for the default location.  Let the user run additional
+     commands if for instance locations are ranges.  */
+  yyloc = yylsp[1-yylen];
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+#endif
+
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */
   if (yydebug)
     {
-      int i;
+      int yyi;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
+      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+		 yyn, yyrline[yyn]);
 
       /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
 
-
   switch (yyn) {
 
 case 3:
@@ -1140,7 +1327,7 @@ case 40:
     break;}
 case 41:
 #line 381 "getdate.y"
-{ PC.rel_day += yyvsp[0].intval ;
+{ PC.rel_day += yyvsp[0].intval; ;
     break;}
 case 42:
 #line 383 "getdate.y"
@@ -1152,7 +1339,7 @@ case 43:
     break;}
 case 44:
 #line 387 "getdate.y"
-{ PC.rel_hour += yyvsp[0].intval ;
+{ PC.rel_hour += yyvsp[0].intval; ;
     break;}
 case 45:
 #line 389 "getdate.y"
@@ -1164,7 +1351,7 @@ case 46:
     break;}
 case 47:
 #line 393 "getdate.y"
-{ PC.rel_minutes += yyvsp[0].intval ;
+{ PC.rel_minutes += yyvsp[0].intval; ;
     break;}
 case 48:
 #line 395 "getdate.y"
@@ -1222,49 +1409,35 @@ case 53:
 { yyval.intval = yyvsp[0].intval; ;
     break;}
 }
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison/bison.simple"
+
+#line 705 "c:/djgpp/lib/bison.sim"
+
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp -= yylen;
 #endif
 
-#if YYDEBUG != 0
+#if YYDEBUG
   if (yydebug)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
 #endif
 
   *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
+#if YYLSP_NEEDED
+  *++yylsp = yyloc;
 #endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
@@ -1276,10 +1449,13 @@ case 53:
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
 
@@ -1288,102 +1464,121 @@ yyerrlab:   /* here on detecting error *
 
       if (yyn > YYFLAG && yyn < YYLAST)
 	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
+	  YYSIZE_T yysize = 0;
+	  char *yymsg;
+	  int yyx, yycount;
+
+	  yycount = 0;
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	    if (yycheck[yyx + yyn] == yyx)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("parse error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
 	    {
-	      strcpy(msg, "parse error");
+	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
 
-	      if (count < 5)
+	      if (yycount < 5)
 		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
+		    if (yycheck[yyx + yyn] == yyx)
 		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yycount++;
 		      }
 		}
-	      yyerror(msg);
-	      free(msg);
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("parse error; also virtual memory exceeded");
+	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+#endif /* defined (YYERROR_VERBOSE) */
+	yyerror ("parse error");
     }
-
   goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
 
+
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
 
       /* return failure if at end of input */
       if (yychar == YYEOF)
 	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+		  yychar, yytname[yychar1]));
       yychar = YYEMPTY;
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
 
   yyerrstatus = 3;		/* Each real token shifted decrements this */
 
   goto yyerrhandle;
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
 
+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token.                                                       |
+`-------------------------------------------------------------------*/
+yyerrdefault:
 #if 0
   /* This is wrong; only states that explicitly want error tokens
      should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
+
+  /* If its default is to accept any token, ok.  Otherwise pop it.  */
+  yyn = yydefact[yystate];
+  if (yyn)
+    goto yydefault;
 #endif
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token                                                    |
+`---------------------------------------------------------------*/
+yyerrpop:
+  if (yyssp == yyss)
+    YYABORT;
   yyvsp--;
   yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp--;
 #endif
 
-#if YYDEBUG != 0
+#if YYDEBUG
   if (yydebug)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "Error: state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
 #endif
 
+/*--------------.
+| yyerrhandle.  |
+`--------------*/
 yyerrhandle:
-
   yyn = yypact[yystate];
   if (yyn == YYFLAG)
     goto yyerrdefault;
@@ -1406,42 +1601,45 @@ yyerrhandle:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here.  |
+`---------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
+
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
 #line 445 "getdate.y"
 
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/getdate.y	2001-04-08 20:00:26.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/getdate.y	2002-06-11 14:23:42.000000000 +0000
@@ -378,19 +378,19 @@ relunit:
   | tSNUMBER tDAY_UNIT
       { PC.rel_day += $1.value * $2; }
   | tDAY_UNIT
-      { PC.rel_day += $1 }
+      { PC.rel_day += $1; }
   | tUNUMBER tHOUR_UNIT
       { PC.rel_hour += $1.value * $2; }
   | tSNUMBER tHOUR_UNIT
       { PC.rel_hour += $1.value * $2; }
   | tHOUR_UNIT
-      { PC.rel_hour += $1 }
+      { PC.rel_hour += $1; }
   | tUNUMBER tMINUTE_UNIT
       { PC.rel_minutes += $1.value * $2; }
   | tSNUMBER tMINUTE_UNIT
       { PC.rel_minutes += $1.value * $2; }
   | tMINUTE_UNIT
-      { PC.rel_minutes += $1 }
+      { PC.rel_minutes += $1; }
   | tUNUMBER tSEC_UNIT
       { PC.rel_seconds += $1.value * $2; }
   | tSNUMBER tSEC_UNIT
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/lchown.h	1999-09-05 06:55:28.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/lchown.h	2002-06-11 13:41:44.000000000 +0000
@@ -7,3 +7,12 @@
 #  define ENOSYS EINVAL
 # endif
 #endif
+
+#ifdef  __DJGPP__
+/* Versions of DJGPP > 2.03 support symlinks (currently only DJGPP CVS). If
+ * symlinks are not supported, just fail this test every time;
+ * i.e. no file is a link. */
+#ifndef S_ISLNK
+#define S_ISLNK(x)  (0)
+#endif
+#endif
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/makepath.c	2000-11-05 13:10:24.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/makepath.c	2002-06-11 13:41:44.000000000 +0000
@@ -114,10 +114,26 @@ extern int errno;
 # define _(Text) Text
 #endif
 
+#if HAVE_LIMITS_H
+/* limits.h must come before pathmax.h because limits.h on some systems
+ * undefs PATH_MAX, whereas pathmax.h sets PATH_MAX.  */
+# include <limits.h>
+#endif
+
+#include "pathmax.h"
+
 #include "save-cwd.h"
 #include "error.h"
 #include "quote.h"
 
+#ifdef MSDOS
+# ifdef __DJGPP__
+#  define FIXPATH(x,y)  _fixpath(x,y)
+# else  /* !__DJGPP__ */
+#  error FIXPATH macro not defined on MSDOS!
+# endif /* !__DJGPP__ */
+#endif
+
 void strip_trailing_slashes ();
 
 #define CLEANUP_CWD					\
@@ -135,6 +151,32 @@ void strip_trailing_slashes ();
     }							\
   while (0)
 
+#ifdef MSDOS
+
+#define MSDOS_CLEANUP_CWD					\
+  do								\
+    {								\
+      if (msdos_cwd_saved)					\
+        {							\
+          int fail = restore_cwd (&msdos_cwd, NULL, NULL);	\
+          free_cwd (&msdos_cwd);				\
+          if (fail)						\
+	    return 1;						\
+        }							\
+    }								\
+  while (0)
+     
+#define CLEANUP						\
+  do							\
+    {							\
+      umask (oldmask);					\
+      MSDOS_CLEANUP_CWD;				\
+      CLEANUP_CWD;					\
+    }							\
+  while (0)
+     
+#else /* !MSDOS */
+     
 #define CLEANUP						\
   do							\
     {							\
@@ -142,6 +184,8 @@ void strip_trailing_slashes ();
       CLEANUP_CWD;					\
     }							\
   while (0)
+     
+#endif /* !MSDOS */     
 
 /* Attempt to create directory DIR (aka DIRPATH) with the specified MODE.
    If CREATED_DIR_P is non-NULL, set *CREATED_DIR_P to non-zero if this
@@ -238,6 +282,10 @@ make_path (const char *argpath,
       struct ptr_list *p, *leading_dirs = NULL;
       int do_chdir;		/* Whether to chdir before each mkdir.  */
       struct saved_cwd cwd;
+#ifdef MSDOS
+      struct saved_cwd msdos_cwd;
+      int msdos_cwd_saved = 0;
+#endif      
       char *basename_dir;
       char *dirpath;
 
@@ -245,10 +293,18 @@ make_path (const char *argpath,
       mode_t oldmask = umask (0);
 
       /* Make a copy of ARGPATH that we can scribble NULs on.  */
+#ifndef MSDOS      
       dirpath = (char *) alloca (strlen (argpath) + 1);
-      strcpy (dirpath, argpath);
+      strcpy (dirpath, argpath);      
+#else /* MSDOS */
+      /* On MS-DOS we can have paths like c:dir/dir2, since there are multiple
+       * working directories (one per drive) - expand these paths to full
+       * paths in the copy. */
+      dirpath = (char *) alloca(PATH_MAX + 1);	
+      FIXPATH(argpath, dirpath);
+#endif /* MSDOS */
       strip_trailing_slashes (dirpath);
-
+      
       /* If leading directories shouldn't be writable or executable,
 	 or should have set[ug]id or sticky bits set and we are setting
 	 their owners, we need to fix their permissions after making them.  */
@@ -268,15 +324,40 @@ make_path (const char *argpath,
       /* If we can record the current working directory, we may be able
 	 to do the chdir optimization.  */
       do_chdir = !save_cwd (&cwd);
-
+      
       /* If we've saved the cwd and DIRPATH is an absolute pathname,
 	 we must chdir to `/' in order to enable the chdir optimization.
          So if chdir ("/") fails, turn off the optimization.  */
+#ifdef MSDOS
+      {
+        char d[4];
+	
+	/* Work out which drive letter we need to save the working directory
+	 * for & then change to its root directory. On MS-DOS, dirpath will
+	 * have a drive letter and be an absolute path, since we've
+	 * FIXPATH()'d it. */
+	d[0] = dirpath[0], d[1] = dirpath[1], d[2] = '\0';
+	if (chdir (d) == 0)
+	  msdos_cwd_saved = !save_cwd(&msdos_cwd);
+	
+	d[2] = '/', d[3] = '\0';
+	
+	if (do_chdir && chdir (d) < 0)
+	  do_chdir = 0;
+      }
+#else
       if (do_chdir && *dirpath == '/' && chdir ("/") < 0)
 	do_chdir = 0;
+#endif	  	      
 
       slash = dirpath;
 
+#ifdef MSDOS
+      /* Skip over leading drive letters. */
+      if (slash[1] == ':')
+	slash += 2;
+#endif
+      
       /* Skip over leading slashes.  */
       while (*slash == '/')
 	slash++;
@@ -398,6 +479,7 @@ make_path (const char *argpath,
 	  retval = 1;
 	}
 
+      MSDOS_CLEANUP_CWD;
       CLEANUP_CWD;
 
       /* If the mode for leading directories didn't include owner "wx"
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/path-concat.c	2001-03-13 15:59:28.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/path-concat.c	2002-06-11 13:41:44.000000000 +0000
@@ -55,6 +55,15 @@ char *malloc ();
 char *strdup ();
 #endif
 
+/* Richard Dawe <rich@phekda.freeserve.co.uk>: Cope with MS-DOSisms. */
+#ifdef MSDOS
+# undef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) \
+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
+# undef ISSLASH
+# define ISSLASH(c) (((c) == '/') || ((c) == '\\'))
+#endif /* MSDOS */
+
 #ifndef DIRECTORY_SEPARATOR
 # define DIRECTORY_SEPARATOR '/'
 #endif
@@ -99,6 +108,12 @@ path_concat (const char *dir, const char
       return p_concat;
     }
 
+#ifdef MSDOS
+  /* Strip the filesystem prefix off base. This is so that
+   * "path1"+"d:/path2" yields "path1/path2". */
+  base += FILESYSTEM_PREFIX_LEN (base);
+#endif
+
   /* DIR is not empty. */
   base_len = strlen (base);
   dir_len = strlen (dir);
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/stripslash.c	2000-12-08 08:20:52.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/stripslash.c	2002-06-11 13:41:44.000000000 +0000
@@ -41,6 +41,17 @@ strip_trailing_slashes (char *path)
   int last;
 
   last = strlen (path) - 1;
+#ifdef MSDOS
+  /* Richard Dawe <rich@phekda.freeserve.co.uk>: Applied Eli's DJGPP port
+   * patch by hand. */
+  /* Leave alone a single slash in "d:/".  "d:" means something
+   * VERY different on MSDOS.  */
+  if (path[0] && (path[1] == ':'))
+    {
+      path += 2;
+      last -= 2;
+    }
+#endif
   while (0 < last && ISSLASH (path[last]))
     path[last--] = '\0';
 }
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/userspec.c	2000-12-16 13:23:48.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/userspec.c	2002-06-11 13:41:46.000000000 +0000
@@ -232,15 +232,6 @@ parse_user_spec (const char *spec_arg, u
   if (u == NULL && g == NULL)
     return _(E_cannot_omit_both);
 
-#ifdef __DJGPP__
-  /* Pretend that we are the user U whose group is G.  This makes
-     pwd and grp functions ``know'' about the UID and GID of these.  */
-  if (u && !is_number (u))
-    setenv ("USER", u, 1);
-  if (g && !is_number (g))
-    setenv ("GROUP", g, 1);
-#endif
-
   if (u != NULL)
     {
       pwd = getpwnam (u);
@@ -248,7 +239,12 @@ parse_user_spec (const char *spec_arg, u
 	{
 
 	  if (!is_number (u))
+#ifdef MSDOS
+	    /* Under MS-DOS we allow to give away files to ANY user.  */
+	    *uid = 2*getuid();	/* why twice, you ask? why not? */
+#else
 	    error_msg = E_invalid_user;
+#endif
 	  else
 	    {
 	      int use_login_group;
@@ -300,7 +296,12 @@ parse_user_spec (const char *spec_arg, u
       if (grp == NULL)
 	{
 	  if (!is_number (g))
+#ifdef MSDOS
+	    /* Under MS-DOS we allow to give away files to ANY group.  */
+	    *gid = 2*getgid();
+#else
 	    error_msg = E_invalid_group;
+#endif
 	  else
 	    {
 	      unsigned long int tmp_long;
--- /dev/c/develop/ports/orig/fileutils-4.1/lib/xstat.in	2000-10-29 11:02:34.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/lib/xstat.in	2002-06-11 13:41:48.000000000 +0000
@@ -41,6 +41,8 @@ extern int errno;
 #endif
 #if !defined(S_ISLNK) && defined(S_IFLNK)
 # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#elif !defined(S_ISLNK) && !defined(S_IFLNK)
+# define S_ISLNK(m) (0)
 #endif
 
 #ifndef HAVE_DECL_FREE
--- /dev/c/develop/ports/orig/fileutils-4.1/m4/Makefile.in	2001-04-29 08:25:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/m4/Makefile.in	2002-06-11 14:19:22.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,17 +104,16 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 EXTRA_DIST = README Makefile.am.in \
 afs.m4 \
 assert.m4 \
@@ -189,27 +184,23 @@ utime.m4 \
 utimes.m4 \
 xstrtoumax.m4
 
-EXEEXT =
-OBJEXT = o
 subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = README ChangeLog Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  m4/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  m4/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -221,7 +212,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -246,23 +241,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -271,11 +263,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -283,7 +275,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -297,13 +289,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am info info-am install \
 	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 
 Makefile.am: Makefile.am.in
@@ -316,7 +310,6 @@ Makefile.am: Makefile.am.in
 	sed -n '/^##m4-files-end/,$$p' $< >> $@t
 	chmod a-w $@t
 	mv $@t $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/man/Makefile.in	2001-04-29 08:25:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/man/Makefile.in	2002-06-11 14:19:22.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -48,19 +48,14 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -70,6 +65,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -81,7 +77,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -92,31 +87,36 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
-PERL = @PERL@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
+# Use `ginstall' in the definition of man_MANS to avoid
+# confusion with the `install' target.  The install rule transforms `ginstall'
+# to install before applying any user-specified name transformations.
+transform = s/ginstall/install/; @program_transform_name@
+PERL = @PERL@
 
 man_MANS = chgrp.1 chmod.1 chown.1 cp.1 dir.1 dd.1 df.1 dircolors.1 \
   du.1 ginstall.1 ln.1 ls.1 mkdir.1 mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 \
@@ -127,44 +127,36 @@ man_aux = $(man_MANS:.1=.x)
 EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
   Makefile.maint GNUmakefile Makefile.summ
 
-PERL = @PERL@
 HELP2MAN = help2man
 MAINTAINERCLEANFILES = $(man_MANS)
-
-# Use `ginstall' in the definition of man_MANS to avoid
-# confusion with the `install' target.  The install rule transforms `ginstall'
-# to install before applying any user-specified name transformations.
-transform = s/ginstall/install/; @program_transform_name@
-EXEEXT =
-OBJEXT = o
 subdir = man
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-man1dir = $(mandir)/man1
-MANS = $(man_MANS)
 
 NROFF = nroff
+MANS = $(man_MANS)
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  man/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  man/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
+
+man1dir = $(mandir)/man1
 install-man1: $(man1_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
@@ -179,11 +171,11 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
 	done
-
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
@@ -207,7 +199,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -233,23 +229,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
@@ -259,11 +252,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -271,7 +264,7 @@ install-data-am: install-man
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man: install-man1
 
@@ -285,23 +278,22 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-uninstall-am: uninstall-man
+uninstall-am: uninstall-info-am uninstall-man
 
 uninstall-man: uninstall-man1
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am info info-am install \
 	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-man1 \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-man \
-	uninstall-man1
+	install-exec-am install-info install-info-am install-man \
+	install-man1 install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-man uninstall-man1
 
 
 # For additional rules usually of interest only to the maintainer,
 # see GNUmakefile and Makefile.maint.
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/man/Makefile.maint	2000-02-15 21:05:26.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/man/Makefile.maint	2002-06-11 22:38:40.000000000 +0000
@@ -24,17 +24,17 @@ ginstall_filter = sed s/ginstall/install
 
 executable = $(patsubst %/install,%/ginstall, ../src/$(basename $@))
 $(man_MANS): %.1: %.x $(HELP2MAN)
-	@if test -f $(executable); then \
+	@if test -x $(executable); then \
 	  echo "Updating man page $@"; \
-	  rm -f $@-t; \
+	  rm -f $@t; \
 	  $(HELP2MAN-run) \
 	      --include=$(basename $@).x $(executable) \
-	    > $@-t1 || exit 1; \
-	  $(ginstall_filter) $@-t1 > $@-t || exit 1; \
-	  rm -f $@-t1; \
-	  chmod -w $@-t || exit 1; \
+	    > $@t1 || exit 1; \
+	  $(ginstall_filter) $@t1 > $@t || exit 1; \
+	  rm -f $@t1; \
+	  chmod -w $@t || exit 1; \
 	  rm -f $@ || exit 1; \
-	  mv $@-t $@ || exit 1; \
+	  mv $@t $@ || exit 1; \
 	else \
 	  echo "WARNING: The man page $@ cannot be updated yet."; \
 	  echo "         Retry once the corresponding executable is built."; \
--- /dev/c/develop/ports/orig/fileutils-4.1/man/help2man	2000-12-24 09:33:14.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/man/help2man	2002-06-11 13:41:48.000000000 +0000
@@ -26,6 +26,14 @@ use Getopt::Long;
 use Text::Tabs qw(expand);
 use POSIX qw(strftime setlocale LC_TIME);
 
+# If we're running in a DJGPP environment, set up $ENV{'SHELL'} to point
+# to bash. If we don't do this, the wrong shell might be used
+# (e.g. command.com) and backtick execution with stderr redirection
+# (e.g. `$ARGV[0] --help 2>/dev/null`) will fail.
+if (defined($ENV{DJDIR})) {
+    $ENV{SHELL} = $ENV{DJDIR}.'/bin/bash.exe';
+}
+
 my $this_program = 'help2man';
 my $this_version = '1.24';
 my $version_info = <<EOT;
--- /dev/c/develop/ports/orig/fileutils-4.1/src/Makefile.am	2001-03-09 18:32:54.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/Makefile.am	2002-06-11 14:08:38.000000000 +0000
@@ -1,11 +1,13 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 AUTOMAKE_OPTIONS = ansi2knr
 
+OBJEXT = @OBJEXT@
+
 EXTRA_PROGRAMS = df
 
 bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
 ginstall ln dir vdir ls mkdir \
-mkfifo mknod mv rm rmdir shred sync touch @DF_PROG@
+mkfifo mknod mv rm rmdir shred sync touch @DF_PROG@@EXEEXT@
 
 datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
@@ -31,17 +33,35 @@ $(bin_PROGRAMS) $(libexec_PROGRAMS): ../
 # to install before applying any user-specified name transformations.
 
 transform = s/ginstall/install/; @program_transform_name@
-ginstall_SOURCES = install.c copy.c cp-hash.c
-
-cp_SOURCES = cp.c copy.c cp-hash.c
-dir_SOURCES = ls.c ls-dir.c
-vdir_SOURCES = ls.c ls-vdir.c
-ls_SOURCES = ls.c ls-ls.c
-chown_SOURCES = chown.c chown-core.c
-chgrp_SOURCES = chgrp.c chown-core.c
+ginstall_SOURCES = install.c copy.c cp-hash.c djutils.c djstart.c
 
-mv_SOURCES = mv.c copy.c cp-hash.c remove.c
-rm_SOURCES = rm.c remove.c
+cp_SOURCES = cp.c copy.c cp-hash.c djutils.c djstart.c
+dir_SOURCES = ls.c ls-dir.c ls-msdos.c djutils.c djstart.c
+vdir_SOURCES = ls.c ls-vdir.c ls-msdos.c djutils.c djstart.c
+ls_SOURCES = ls.c ls-ls.c ls-msdos.c djutils.c djstart.c
+dircolors_SOURCES = dircolors.c djutils.c djstart.c
+chown_SOURCES = chown.c chown-core.c djutils.c djstart.c
+chgrp_SOURCES = chgrp.c chown-core.c djutils.c djstart.c
+chmod_SOURCES = chmod.c djutils.c djstart.c
+
+mv_SOURCES = mv.c copy.c cp-hash.c remove.c djutils.c djstart.c
+rm_SOURCES = rm.c remove.c djutils.c djstart.c
+
+ln_SOURCES = ln.c djutils.c djstart.c
+
+touch_SOURCES = touch.c djutils.c djstart.c
+
+du_SOURCES = du.c djutils.c djstart.c
+df_SOURCES = df.c djutils.c djstart.c
+sync_SOURCES = sync.c djutils.c djstart.c
+
+mkdir_SOURCES = mkdir.c djutils.c djstart.c
+rmdir_SOURCES = rmdir.c djutils.c djstart.c
+
+dd_SOURCES = dd.c djutils.c djstart.c
+mkfifo_SOURCES = mkfifo.c djutils.c djstart.c
+mknod_SOURCES = mknod.c djutils.c djstart.c
+shred_SOURCES = shred.c djutils.c djstart.c
 
 BUILT_SOURCES = dircolors.h
 PERL = @PERL@
--- /dev/c/develop/ports/orig/fileutils-4.1/src/Makefile.in	2001-04-29 11:40:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -30,11 +32,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -47,19 +47,14 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -69,6 +64,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -80,7 +76,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -91,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -99,23 +93,33 @@ NEED_SETGID = @NEED_SETGID@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
-PERL = @PERL@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
+datadir = $(prefix)/@DATADIRNAME@
+
+
+# Use `ginstall' in the definition of PROGRAMS and in dependencies to avoid
+# confusion with the `install' target.  The install rule transforms `ginstall'
+# to install before applying any user-specified name transformations.
+transform = s/ginstall/install/; @program_transform_name@
+
+OBJEXT = @OBJEXT@
+PERL = @PERL@
 
 AUTOMAKE_OPTIONS = ansi2knr
 
@@ -123,10 +127,8 @@ EXTRA_PROGRAMS = df
 
 bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
 ginstall ln dir vdir ls mkdir \
-mkfifo mknod mv rm rmdir shred sync touch @DF_PROG@
-
+mkfifo mknod mv rm rmdir shred sync touch @DF_PROG@@EXEEXT@
 
-datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
 
 noinst_HEADERS = \
@@ -143,193 +145,224 @@ dir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
 ls_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
 shred_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
 vdir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@
+ginstall_SOURCES = install.c copy.c cp-hash.c djutils.c djstart.c
 
-# Use `ginstall' in the definition of PROGRAMS and in dependencies to avoid
-# confusion with the `install' target.  The install rule transforms `ginstall'
-# to install before applying any user-specified name transformations.
-
-transform = s/ginstall/install/; @program_transform_name@
-ginstall_SOURCES = install.c copy.c cp-hash.c
-
-cp_SOURCES = cp.c copy.c cp-hash.c
-dir_SOURCES = ls.c ls-dir.c
-vdir_SOURCES = ls.c ls-vdir.c
-ls_SOURCES = ls.c ls-ls.c
-chown_SOURCES = chown.c chown-core.c
-chgrp_SOURCES = chgrp.c chown-core.c
-
-mv_SOURCES = mv.c copy.c cp-hash.c remove.c
-rm_SOURCES = rm.c remove.c
+cp_SOURCES = cp.c copy.c cp-hash.c djutils.c djstart.c
+dir_SOURCES = ls.c ls-dir.c ls-msdos.c djutils.c djstart.c
+vdir_SOURCES = ls.c ls-vdir.c ls-msdos.c djutils.c djstart.c
+ls_SOURCES = ls.c ls-ls.c ls-msdos.c djutils.c djstart.c
+dircolors_SOURCES = dircolors.c djutils.c djstart.c
+chown_SOURCES = chown.c chown-core.c djutils.c djstart.c
+chgrp_SOURCES = chgrp.c chown-core.c djutils.c djstart.c
+chmod_SOURCES = chmod.c djutils.c djstart.c
+
+mv_SOURCES = mv.c copy.c cp-hash.c remove.c djutils.c djstart.c
+rm_SOURCES = rm.c remove.c djutils.c djstart.c
+
+ln_SOURCES = ln.c djutils.c djstart.c
+
+touch_SOURCES = touch.c djutils.c djstart.c
+
+du_SOURCES = du.c djutils.c djstart.c
+df_SOURCES = df.c djutils.c djstart.c
+sync_SOURCES = sync.c djutils.c djstart.c
+
+mkdir_SOURCES = mkdir.c djutils.c djstart.c
+rmdir_SOURCES = rmdir.c djutils.c djstart.c
+
+dd_SOURCES = dd.c djutils.c djstart.c
+mkfifo_SOURCES = mkfifo.c djutils.c djstart.c
+mknod_SOURCES = mknod.c djutils.c djstart.c
+shred_SOURCES = shred.c djutils.c djstart.c
 
 BUILT_SOURCES = dircolors.h
-PERL = @PERL@
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
 MAINTAINERCLEANFILES = dircolors.h
-EXEEXT =
-OBJEXT = o
 subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 EXTRA_PROGRAMS = df$(EXEEXT)
 bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \
-dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) ginstall$(EXEEXT) \
-ln$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) ls$(EXEEXT) mkdir$(EXEEXT) \
-mkfifo$(EXEEXT) mknod$(EXEEXT) mv$(EXEEXT) rm$(EXEEXT) rmdir$(EXEEXT) \
-shred$(EXEEXT) sync$(EXEEXT) touch$(EXEEXT) @DF_PROG@
+	dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) ginstall$(EXEEXT) \
+	ln$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) ls$(EXEEXT) \
+	mkdir$(EXEEXT) mkfifo$(EXEEXT) mknod$(EXEEXT) mv$(EXEEXT) \
+	rm$(EXEEXT) rmdir$(EXEEXT) shred$(EXEEXT) sync$(EXEEXT) \
+	touch$(EXEEXT) @DF_PROG@@EXEEXT@
 PROGRAMS = $(bin_PROGRAMS)
 
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = @ANSI2KNR@
-am_chgrp_OBJECTS = chgrp$U.$(OBJEXT) chown-core$U.$(OBJEXT)
+am_chgrp_OBJECTS = chgrp$U.$(OBJEXT) chown-core$U.$(OBJEXT) \
+	djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 chgrp_OBJECTS = $(am_chgrp_OBJECTS)
 chgrp_LDADD = $(LDADD)
 chgrp_DEPENDENCIES = ../lib/libfetish.a
-chgrp_LDFLAGS = 
-chmod_SOURCES = chmod.c
-chmod_OBJECTS = chmod$U.$(OBJEXT)
+chgrp_LDFLAGS =
+am_chmod_OBJECTS = chmod$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+chmod_OBJECTS = $(am_chmod_OBJECTS)
 chmod_LDADD = $(LDADD)
 chmod_DEPENDENCIES = ../lib/libfetish.a
-chmod_LDFLAGS = 
-am_chown_OBJECTS = chown$U.$(OBJEXT) chown-core$U.$(OBJEXT)
+chmod_LDFLAGS =
+am_chown_OBJECTS = chown$U.$(OBJEXT) chown-core$U.$(OBJEXT) \
+	djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 chown_OBJECTS = $(am_chown_OBJECTS)
 chown_LDADD = $(LDADD)
 chown_DEPENDENCIES = ../lib/libfetish.a
-chown_LDFLAGS = 
-am_cp_OBJECTS = cp$U.$(OBJEXT) copy$U.$(OBJEXT) cp-hash$U.$(OBJEXT)
+chown_LDFLAGS =
+am_cp_OBJECTS = cp$U.$(OBJEXT) copy$U.$(OBJEXT) cp-hash$U.$(OBJEXT) \
+	djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 cp_OBJECTS = $(am_cp_OBJECTS)
 cp_LDADD = $(LDADD)
 cp_DEPENDENCIES = ../lib/libfetish.a
-cp_LDFLAGS = 
-dd_SOURCES = dd.c
-dd_OBJECTS = dd$U.$(OBJEXT)
+cp_LDFLAGS =
+am_dd_OBJECTS = dd$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
+dd_OBJECTS = $(am_dd_OBJECTS)
 dd_LDADD = $(LDADD)
 dd_DEPENDENCIES = ../lib/libfetish.a
-dd_LDFLAGS = 
-df_SOURCES = df.c
-df_OBJECTS = df$U.$(OBJEXT)
+dd_LDFLAGS =
+am_df_OBJECTS = df$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
+df_OBJECTS = $(am_df_OBJECTS)
 df_LDADD = $(LDADD)
 df_DEPENDENCIES = ../lib/libfetish.a
-df_LDFLAGS = 
-am_dir_OBJECTS = ls$U.$(OBJEXT) ls-dir$U.$(OBJEXT)
+df_LDFLAGS =
+am_dir_OBJECTS = ls$U.$(OBJEXT) ls-dir$U.$(OBJEXT) ls-msdos$U.$(OBJEXT) \
+	djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 dir_OBJECTS = $(am_dir_OBJECTS)
 dir_DEPENDENCIES = ../lib/libfetish.a
-dir_LDFLAGS = 
-dircolors_SOURCES = dircolors.c
-dircolors_OBJECTS = dircolors$U.$(OBJEXT)
+dir_LDFLAGS =
+am_dircolors_OBJECTS = dircolors$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+dircolors_OBJECTS = $(am_dircolors_OBJECTS)
 dircolors_LDADD = $(LDADD)
 dircolors_DEPENDENCIES = ../lib/libfetish.a
-dircolors_LDFLAGS = 
-du_SOURCES = du.c
-du_OBJECTS = du$U.$(OBJEXT)
+dircolors_LDFLAGS =
+am_du_OBJECTS = du$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
+du_OBJECTS = $(am_du_OBJECTS)
 du_LDADD = $(LDADD)
 du_DEPENDENCIES = ../lib/libfetish.a
-du_LDFLAGS = 
+du_LDFLAGS =
 am_ginstall_OBJECTS = install$U.$(OBJEXT) copy$U.$(OBJEXT) \
-cp-hash$U.$(OBJEXT)
+	cp-hash$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 ginstall_OBJECTS = $(am_ginstall_OBJECTS)
 ginstall_LDADD = $(LDADD)
 ginstall_DEPENDENCIES = ../lib/libfetish.a
-ginstall_LDFLAGS = 
-ln_SOURCES = ln.c
-ln_OBJECTS = ln$U.$(OBJEXT)
+ginstall_LDFLAGS =
+am_ln_OBJECTS = ln$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
+ln_OBJECTS = $(am_ln_OBJECTS)
 ln_LDADD = $(LDADD)
 ln_DEPENDENCIES = ../lib/libfetish.a
-ln_LDFLAGS = 
-am_ls_OBJECTS = ls$U.$(OBJEXT) ls-ls$U.$(OBJEXT)
+ln_LDFLAGS =
+am_ls_OBJECTS = ls$U.$(OBJEXT) ls-ls$U.$(OBJEXT) ls-msdos$U.$(OBJEXT) \
+	djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 ls_OBJECTS = $(am_ls_OBJECTS)
 ls_DEPENDENCIES = ../lib/libfetish.a
-ls_LDFLAGS = 
-mkdir_SOURCES = mkdir.c
-mkdir_OBJECTS = mkdir$U.$(OBJEXT)
+ls_LDFLAGS =
+am_mkdir_OBJECTS = mkdir$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+mkdir_OBJECTS = $(am_mkdir_OBJECTS)
 mkdir_LDADD = $(LDADD)
 mkdir_DEPENDENCIES = ../lib/libfetish.a
-mkdir_LDFLAGS = 
-mkfifo_SOURCES = mkfifo.c
-mkfifo_OBJECTS = mkfifo$U.$(OBJEXT)
+mkdir_LDFLAGS =
+am_mkfifo_OBJECTS = mkfifo$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+mkfifo_OBJECTS = $(am_mkfifo_OBJECTS)
 mkfifo_LDADD = $(LDADD)
 mkfifo_DEPENDENCIES = ../lib/libfetish.a
-mkfifo_LDFLAGS = 
-mknod_SOURCES = mknod.c
-mknod_OBJECTS = mknod$U.$(OBJEXT)
+mkfifo_LDFLAGS =
+am_mknod_OBJECTS = mknod$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+mknod_OBJECTS = $(am_mknod_OBJECTS)
 mknod_LDADD = $(LDADD)
 mknod_DEPENDENCIES = ../lib/libfetish.a
-mknod_LDFLAGS = 
+mknod_LDFLAGS =
 am_mv_OBJECTS = mv$U.$(OBJEXT) copy$U.$(OBJEXT) cp-hash$U.$(OBJEXT) \
-remove$U.$(OBJEXT)
+	remove$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 mv_OBJECTS = $(am_mv_OBJECTS)
 mv_LDADD = $(LDADD)
 mv_DEPENDENCIES = ../lib/libfetish.a
-mv_LDFLAGS = 
-am_rm_OBJECTS = rm$U.$(OBJEXT) remove$U.$(OBJEXT)
+mv_LDFLAGS =
+am_rm_OBJECTS = rm$U.$(OBJEXT) remove$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
 rm_OBJECTS = $(am_rm_OBJECTS)
 rm_LDADD = $(LDADD)
 rm_DEPENDENCIES = ../lib/libfetish.a
-rm_LDFLAGS = 
-rmdir_SOURCES = rmdir.c
-rmdir_OBJECTS = rmdir$U.$(OBJEXT)
+rm_LDFLAGS =
+am_rmdir_OBJECTS = rmdir$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+rmdir_OBJECTS = $(am_rmdir_OBJECTS)
 rmdir_LDADD = $(LDADD)
 rmdir_DEPENDENCIES = ../lib/libfetish.a
-rmdir_LDFLAGS = 
-shred_SOURCES = shred.c
-shred_OBJECTS = shred$U.$(OBJEXT)
+rmdir_LDFLAGS =
+am_shred_OBJECTS = shred$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+shred_OBJECTS = $(am_shred_OBJECTS)
 shred_DEPENDENCIES = ../lib/libfetish.a
-shred_LDFLAGS = 
-sync_SOURCES = sync.c
-sync_OBJECTS = sync$U.$(OBJEXT)
+shred_LDFLAGS =
+am_sync_OBJECTS = sync$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+sync_OBJECTS = $(am_sync_OBJECTS)
 sync_LDADD = $(LDADD)
 sync_DEPENDENCIES = ../lib/libfetish.a
-sync_LDFLAGS = 
-touch_SOURCES = touch.c
-touch_OBJECTS = touch$U.$(OBJEXT)
+sync_LDFLAGS =
+am_touch_OBJECTS = touch$U.$(OBJEXT) djutils$U.$(OBJEXT) \
+	djstart$U.$(OBJEXT)
+touch_OBJECTS = $(am_touch_OBJECTS)
 touch_LDADD = $(LDADD)
 touch_DEPENDENCIES = ../lib/libfetish.a
-touch_LDFLAGS = 
-am_vdir_OBJECTS = ls$U.$(OBJEXT) ls-vdir$U.$(OBJEXT)
+touch_LDFLAGS =
+am_vdir_OBJECTS = ls$U.$(OBJEXT) ls-vdir$U.$(OBJEXT) \
+	ls-msdos$U.$(OBJEXT) djutils$U.$(OBJEXT) djstart$U.$(OBJEXT)
 vdir_OBJECTS = $(am_vdir_OBJECTS)
 vdir_DEPENDENCIES = ../lib/libfetish.a
-vdir_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CFLAGS = @CFLAGS@
+vdir_LDFLAGS =
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/chgrp$U.Po $(DEPDIR)/chmod$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/chown$U.Po $(DEPDIR)/chown-core$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/copy$U.Po $(DEPDIR)/cp$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/cp-hash$U.Po $(DEPDIR)/dd$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/df$U.Po $(DEPDIR)/dircolors$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/djstart$U.Po $(DEPDIR)/djutils$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/du$U.Po $(DEPDIR)/install$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ln$U.Po $(DEPDIR)/ls$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ls-dir$U.Po $(DEPDIR)/ls-ls$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ls-msdos$U.Po $(DEPDIR)/ls-vdir$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mkdir$U.Po $(DEPDIR)/mkfifo$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mknod$U.Po $(DEPDIR)/mv$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/remove$U.Po $(DEPDIR)/rm$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rmdir$U.Po $(DEPDIR)/shred$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/sync$U.Po $(DEPDIR)/touch$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(chgrp_SOURCES) chmod.c $(chown_SOURCES) $(cp_SOURCES) \
-dd.c df.c $(dir_SOURCES) dircolors.c du.c $(ginstall_SOURCES) ln.c \
-$(ls_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) $(rm_SOURCES) \
-rmdir.c shred.c sync.c touch.c $(vdir_SOURCES)
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(chgrp_SOURCES) $(chmod_SOURCES) $(chown_SOURCES) \
+	$(cp_SOURCES) $(dd_SOURCES) $(df_SOURCES) $(dir_SOURCES) \
+	$(dircolors_SOURCES) $(du_SOURCES) $(ginstall_SOURCES) \
+	$(ln_SOURCES) $(ls_SOURCES) $(mkdir_SOURCES) $(mkfifo_SOURCES) \
+	$(mknod_SOURCES) $(mv_SOURCES) $(rm_SOURCES) $(rmdir_SOURCES) \
+	$(shred_SOURCES) $(sync_SOURCES) $(touch_SOURCES) \
+	$(vdir_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/chgrp$U.Po $(DEPDIR)/chmod$U.Po \
-@AMDEP@ $(DEPDIR)/chown$U.Po $(DEPDIR)/chown-core$U.Po \
-@AMDEP@ $(DEPDIR)/copy$U.Po $(DEPDIR)/cp$U.Po $(DEPDIR)/cp-hash$U.Po \
-@AMDEP@ $(DEPDIR)/dd$U.Po $(DEPDIR)/df$U.Po $(DEPDIR)/dircolors$U.Po \
-@AMDEP@ $(DEPDIR)/du$U.Po $(DEPDIR)/install$U.Po $(DEPDIR)/ln$U.Po \
-@AMDEP@ $(DEPDIR)/ls$U.Po $(DEPDIR)/ls-dir$U.Po $(DEPDIR)/ls-ls$U.Po \
-@AMDEP@ $(DEPDIR)/ls-vdir$U.Po $(DEPDIR)/mkdir$U.Po \
-@AMDEP@ $(DEPDIR)/mkfifo$U.Po $(DEPDIR)/mknod$U.Po $(DEPDIR)/mv$U.Po \
-@AMDEP@ $(DEPDIR)/remove$U.Po $(DEPDIR)/rm$U.Po $(DEPDIR)/rmdir$U.Po \
-@AMDEP@ $(DEPDIR)/shred$U.Po $(DEPDIR)/sync$U.Po $(DEPDIR)/touch$U.Po
 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in ansi2knr.1 \
-ansi2knr.c
-
-SOURCES = $(chgrp_SOURCES) chmod.c $(chown_SOURCES) $(cp_SOURCES) dd.c df.c $(dir_SOURCES) dircolors.c du.c $(ginstall_SOURCES) ln.c $(ls_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) $(rm_SOURCES) rmdir.c shred.c sync.c touch.c $(vdir_SOURCES)
-OBJECTS = $(am_chgrp_OBJECTS) chmod$U.$(OBJEXT) $(am_chown_OBJECTS) $(am_cp_OBJECTS) dd$U.$(OBJEXT) df$U.$(OBJEXT) $(am_dir_OBJECTS) dircolors$U.$(OBJEXT) du$U.$(OBJEXT) $(am_ginstall_OBJECTS) ln$U.$(OBJEXT) $(am_ls_OBJECTS) mkdir$U.$(OBJEXT) mkfifo$U.$(OBJEXT) mknod$U.$(OBJEXT) $(am_mv_OBJECTS) $(am_rm_OBJECTS) rmdir$U.$(OBJEXT) shred$U.$(OBJEXT) sync$U.$(OBJEXT) touch$U.$(OBJEXT) $(am_vdir_OBJECTS)
+	ansi2knr.c
+SOURCES = $(chgrp_SOURCES) $(chmod_SOURCES) $(chown_SOURCES) $(cp_SOURCES) $(dd_SOURCES) $(df_SOURCES) $(dir_SOURCES) $(dircolors_SOURCES) $(du_SOURCES) $(ginstall_SOURCES) $(ln_SOURCES) $(ls_SOURCES) $(mkdir_SOURCES) $(mkfifo_SOURCES) $(mknod_SOURCES) $(mv_SOURCES) $(rm_SOURCES) $(rmdir_SOURCES) $(shred_SOURCES) $(sync_SOURCES) $(touch_SOURCES) $(vdir_SOURCES)
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  src/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -337,8 +370,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -353,173 +388,206 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-clean-krextra:
-	-rm -f ansi2knr
-ansi2knr: ansi2knr.$(OBJEXT)
-	$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
-ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
-
-
-mostlyclean-kr:
-	-rm -f *_.c
-
-chgrp: $(chgrp_OBJECTS) $(chgrp_DEPENDENCIES)
-	@rm -f chgrp
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+chgrp$(EXEEXT): $(chgrp_OBJECTS) $(chgrp_DEPENDENCIES) 
+	@rm -f chgrp$(EXEEXT)
 	$(LINK) $(chgrp_LDFLAGS) $(chgrp_OBJECTS) $(chgrp_LDADD) $(LIBS)
-
-chmod: $(chmod_OBJECTS) $(chmod_DEPENDENCIES)
-	@rm -f chmod
+chmod$(EXEEXT): $(chmod_OBJECTS) $(chmod_DEPENDENCIES) 
+	@rm -f chmod$(EXEEXT)
 	$(LINK) $(chmod_LDFLAGS) $(chmod_OBJECTS) $(chmod_LDADD) $(LIBS)
-
-chown: $(chown_OBJECTS) $(chown_DEPENDENCIES)
-	@rm -f chown
+chown$(EXEEXT): $(chown_OBJECTS) $(chown_DEPENDENCIES) 
+	@rm -f chown$(EXEEXT)
 	$(LINK) $(chown_LDFLAGS) $(chown_OBJECTS) $(chown_LDADD) $(LIBS)
-
-cp: $(cp_OBJECTS) $(cp_DEPENDENCIES)
-	@rm -f cp
+cp$(EXEEXT): $(cp_OBJECTS) $(cp_DEPENDENCIES) 
+	@rm -f cp$(EXEEXT)
 	$(LINK) $(cp_LDFLAGS) $(cp_OBJECTS) $(cp_LDADD) $(LIBS)
-
-dd: $(dd_OBJECTS) $(dd_DEPENDENCIES)
-	@rm -f dd
+dd$(EXEEXT): $(dd_OBJECTS) $(dd_DEPENDENCIES) 
+	@rm -f dd$(EXEEXT)
 	$(LINK) $(dd_LDFLAGS) $(dd_OBJECTS) $(dd_LDADD) $(LIBS)
-
-df: $(df_OBJECTS) $(df_DEPENDENCIES)
-	@rm -f df
+df$(EXEEXT): $(df_OBJECTS) $(df_DEPENDENCIES) 
+	@rm -f df$(EXEEXT)
 	$(LINK) $(df_LDFLAGS) $(df_OBJECTS) $(df_LDADD) $(LIBS)
-
-dir: $(dir_OBJECTS) $(dir_DEPENDENCIES)
-	@rm -f dir
+dir$(EXEEXT): $(dir_OBJECTS) $(dir_DEPENDENCIES) 
+	@rm -f dir$(EXEEXT)
 	$(LINK) $(dir_LDFLAGS) $(dir_OBJECTS) $(dir_LDADD) $(LIBS)
-
-dircolors: $(dircolors_OBJECTS) $(dircolors_DEPENDENCIES)
-	@rm -f dircolors
+dircolors$(EXEEXT): $(dircolors_OBJECTS) $(dircolors_DEPENDENCIES) 
+	@rm -f dircolors$(EXEEXT)
 	$(LINK) $(dircolors_LDFLAGS) $(dircolors_OBJECTS) $(dircolors_LDADD) $(LIBS)
-
-du: $(du_OBJECTS) $(du_DEPENDENCIES)
-	@rm -f du
+du$(EXEEXT): $(du_OBJECTS) $(du_DEPENDENCIES) 
+	@rm -f du$(EXEEXT)
 	$(LINK) $(du_LDFLAGS) $(du_OBJECTS) $(du_LDADD) $(LIBS)
-
-ginstall: $(ginstall_OBJECTS) $(ginstall_DEPENDENCIES)
-	@rm -f ginstall
+ginstall$(EXEEXT): $(ginstall_OBJECTS) $(ginstall_DEPENDENCIES) 
+	@rm -f ginstall$(EXEEXT)
 	$(LINK) $(ginstall_LDFLAGS) $(ginstall_OBJECTS) $(ginstall_LDADD) $(LIBS)
-
-ln: $(ln_OBJECTS) $(ln_DEPENDENCIES)
-	@rm -f ln
+ln$(EXEEXT): $(ln_OBJECTS) $(ln_DEPENDENCIES) 
+	@rm -f ln$(EXEEXT)
 	$(LINK) $(ln_LDFLAGS) $(ln_OBJECTS) $(ln_LDADD) $(LIBS)
-
-ls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
-	@rm -f ls
+ls$(EXEEXT): $(ls_OBJECTS) $(ls_DEPENDENCIES) 
+	@rm -f ls$(EXEEXT)
 	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)
-
-mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES)
-	@rm -f mkdir
+mkdir$(EXEEXT): $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES) 
+	@rm -f mkdir$(EXEEXT)
 	$(LINK) $(mkdir_LDFLAGS) $(mkdir_OBJECTS) $(mkdir_LDADD) $(LIBS)
-
-mkfifo: $(mkfifo_OBJECTS) $(mkfifo_DEPENDENCIES)
-	@rm -f mkfifo
+mkfifo$(EXEEXT): $(mkfifo_OBJECTS) $(mkfifo_DEPENDENCIES) 
+	@rm -f mkfifo$(EXEEXT)
 	$(LINK) $(mkfifo_LDFLAGS) $(mkfifo_OBJECTS) $(mkfifo_LDADD) $(LIBS)
-
-mknod: $(mknod_OBJECTS) $(mknod_DEPENDENCIES)
-	@rm -f mknod
+mknod$(EXEEXT): $(mknod_OBJECTS) $(mknod_DEPENDENCIES) 
+	@rm -f mknod$(EXEEXT)
 	$(LINK) $(mknod_LDFLAGS) $(mknod_OBJECTS) $(mknod_LDADD) $(LIBS)
-
-mv: $(mv_OBJECTS) $(mv_DEPENDENCIES)
-	@rm -f mv
+mv$(EXEEXT): $(mv_OBJECTS) $(mv_DEPENDENCIES) 
+	@rm -f mv$(EXEEXT)
 	$(LINK) $(mv_LDFLAGS) $(mv_OBJECTS) $(mv_LDADD) $(LIBS)
-
-rm: $(rm_OBJECTS) $(rm_DEPENDENCIES)
-	@rm -f rm > /dev/null 2>&1 || /bin/rm -f rm
+rm$(EXEEXT): $(rm_OBJECTS) $(rm_DEPENDENCIES) 
+	@rm -f rm$(EXEEXT)
 	$(LINK) $(rm_LDFLAGS) $(rm_OBJECTS) $(rm_LDADD) $(LIBS)
-
-rmdir: $(rmdir_OBJECTS) $(rmdir_DEPENDENCIES)
-	@rm -f rmdir
+rmdir$(EXEEXT): $(rmdir_OBJECTS) $(rmdir_DEPENDENCIES) 
+	@rm -f rmdir$(EXEEXT)
 	$(LINK) $(rmdir_LDFLAGS) $(rmdir_OBJECTS) $(rmdir_LDADD) $(LIBS)
-
-shred: $(shred_OBJECTS) $(shred_DEPENDENCIES)
-	@rm -f shred
+shred$(EXEEXT): $(shred_OBJECTS) $(shred_DEPENDENCIES) 
+	@rm -f shred$(EXEEXT)
 	$(LINK) $(shred_LDFLAGS) $(shred_OBJECTS) $(shred_LDADD) $(LIBS)
-
-sync: $(sync_OBJECTS) $(sync_DEPENDENCIES)
-	@rm -f sync
+sync$(EXEEXT): $(sync_OBJECTS) $(sync_DEPENDENCIES) 
+	@rm -f sync$(EXEEXT)
 	$(LINK) $(sync_LDFLAGS) $(sync_OBJECTS) $(sync_LDADD) $(LIBS)
-
-touch: $(touch_OBJECTS) $(touch_DEPENDENCIES)
-	@rm -f touch
+touch$(EXEEXT): $(touch_OBJECTS) $(touch_DEPENDENCIES) 
+	@rm -f touch$(EXEEXT)
 	$(LINK) $(touch_LDFLAGS) $(touch_OBJECTS) $(touch_LDADD) $(LIBS)
-
-vdir: $(vdir_OBJECTS) $(vdir_DEPENDENCIES)
-	@rm -f vdir
+vdir$(EXEEXT): $(vdir_OBJECTS) $(vdir_DEPENDENCIES) 
+	@rm -f vdir$(EXEEXT)
 	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ANSI2KNR = @ANSI2KNR@
+ansi2knr: ansi2knr.$(OBJEXT)
+	$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
+ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
+
+clean-krextra:
+	-rm -f ansi2knr
+
+mostlyclean-kr:
+	-rm -f *_.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chgrp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chmod$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown-core$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/copy$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cp-hash$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dd$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/df$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dircolors$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/djstart$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/djutils$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/du$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/install$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ln$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ls$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ls-dir$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ls-ls$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ls-msdos$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ls-vdir$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkfifo$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mknod$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mv$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/remove$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rm$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rmdir$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shred$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sync$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/touch$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 chgrp_.c: chgrp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chgrp.c; then echo $(srcdir)/chgrp.c; else echo chgrp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chgrp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chgrp.c; then echo $(srcdir)/chgrp.c; else echo chgrp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chgrp_.c || rm -f chgrp_.c
 chmod_.c: chmod.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chmod.c; then echo $(srcdir)/chmod.c; else echo chmod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chmod_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chmod.c; then echo $(srcdir)/chmod.c; else echo chmod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chmod_.c || rm -f chmod_.c
 chown_.c: chown.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chown.c; then echo $(srcdir)/chown.c; else echo chown.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chown_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chown.c; then echo $(srcdir)/chown.c; else echo chown.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chown_.c || rm -f chown_.c
 chown-core_.c: chown-core.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chown-core.c; then echo $(srcdir)/chown-core.c; else echo chown-core.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chown-core_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chown-core.c; then echo $(srcdir)/chown-core.c; else echo chown-core.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chown-core_.c || rm -f chown-core_.c
 copy_.c: copy.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/copy.c; then echo $(srcdir)/copy.c; else echo copy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > copy_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/copy.c; then echo $(srcdir)/copy.c; else echo copy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > copy_.c || rm -f copy_.c
 cp_.c: cp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cp.c; then echo $(srcdir)/cp.c; else echo cp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cp.c; then echo $(srcdir)/cp.c; else echo cp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cp_.c || rm -f cp_.c
 cp-hash_.c: cp-hash.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cp-hash.c; then echo $(srcdir)/cp-hash.c; else echo cp-hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cp-hash_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cp-hash.c; then echo $(srcdir)/cp-hash.c; else echo cp-hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cp-hash_.c || rm -f cp-hash_.c
 dd_.c: dd.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dd.c; then echo $(srcdir)/dd.c; else echo dd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dd_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dd.c; then echo $(srcdir)/dd.c; else echo dd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dd_.c || rm -f dd_.c
 df_.c: df.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/df.c; then echo $(srcdir)/df.c; else echo df.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > df_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/df.c; then echo $(srcdir)/df.c; else echo df.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > df_.c || rm -f df_.c
 dircolors_.c: dircolors.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dircolors.c; then echo $(srcdir)/dircolors.c; else echo dircolors.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dircolors_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dircolors.c; then echo $(srcdir)/dircolors.c; else echo dircolors.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dircolors_.c || rm -f dircolors_.c
+djstart_.c: djstart.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/djstart.c; then echo $(srcdir)/djstart.c; else echo djstart.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > djstart_.c || rm -f djstart_.c
+djutils_.c: djutils.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/djutils.c; then echo $(srcdir)/djutils.c; else echo djutils.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > djutils_.c || rm -f djutils_.c
 du_.c: du.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/du.c; then echo $(srcdir)/du.c; else echo du.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > du_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/du.c; then echo $(srcdir)/du.c; else echo du.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > du_.c || rm -f du_.c
 install_.c: install.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/install.c; then echo $(srcdir)/install.c; else echo install.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > install_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/install.c; then echo $(srcdir)/install.c; else echo install.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > install_.c || rm -f install_.c
 ln_.c: ln.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ln.c; then echo $(srcdir)/ln.c; else echo ln.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ln_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ln.c; then echo $(srcdir)/ln.c; else echo ln.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ln_.c || rm -f ln_.c
 ls_.c: ls.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls.c; then echo $(srcdir)/ls.c; else echo ls.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls.c; then echo $(srcdir)/ls.c; else echo ls.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls_.c || rm -f ls_.c
 ls-dir_.c: ls-dir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-dir.c; then echo $(srcdir)/ls-dir.c; else echo ls-dir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-dir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-dir.c; then echo $(srcdir)/ls-dir.c; else echo ls-dir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-dir_.c || rm -f ls-dir_.c
 ls-ls_.c: ls-ls.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-ls.c; then echo $(srcdir)/ls-ls.c; else echo ls-ls.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-ls_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-ls.c; then echo $(srcdir)/ls-ls.c; else echo ls-ls.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-ls_.c || rm -f ls-ls_.c
+ls-msdos_.c: ls-msdos.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-msdos.c; then echo $(srcdir)/ls-msdos.c; else echo ls-msdos.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-msdos_.c || rm -f ls-msdos_.c
 ls-vdir_.c: ls-vdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-vdir.c; then echo $(srcdir)/ls-vdir.c; else echo ls-vdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-vdir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ls-vdir.c; then echo $(srcdir)/ls-vdir.c; else echo ls-vdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ls-vdir_.c || rm -f ls-vdir_.c
 mkdir_.c: mkdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkdir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkdir_.c || rm -f mkdir_.c
 mkfifo_.c: mkfifo.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkfifo.c; then echo $(srcdir)/mkfifo.c; else echo mkfifo.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkfifo_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkfifo.c; then echo $(srcdir)/mkfifo.c; else echo mkfifo.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkfifo_.c || rm -f mkfifo_.c
 mknod_.c: mknod.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mknod.c; then echo $(srcdir)/mknod.c; else echo mknod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mknod_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mknod.c; then echo $(srcdir)/mknod.c; else echo mknod.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mknod_.c || rm -f mknod_.c
 mv_.c: mv.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mv.c; then echo $(srcdir)/mv.c; else echo mv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mv_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mv.c; then echo $(srcdir)/mv.c; else echo mv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mv_.c || rm -f mv_.c
 remove_.c: remove.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/remove.c; then echo $(srcdir)/remove.c; else echo remove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > remove_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/remove.c; then echo $(srcdir)/remove.c; else echo remove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > remove_.c || rm -f remove_.c
 rm_.c: rm.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rm.c; then echo $(srcdir)/rm.c; else echo rm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rm_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rm.c; then echo $(srcdir)/rm.c; else echo rm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rm_.c || rm -f rm_.c
 rmdir_.c: rmdir.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rmdir.c; then echo $(srcdir)/rmdir.c; else echo rmdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rmdir_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/rmdir.c; then echo $(srcdir)/rmdir.c; else echo rmdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rmdir_.c || rm -f rmdir_.c
 shred_.c: shred.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/shred.c; then echo $(srcdir)/shred.c; else echo shred.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > shred_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/shred.c; then echo $(srcdir)/shred.c; else echo shred.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > shred_.c || rm -f shred_.c
 sync_.c: sync.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sync.c; then echo $(srcdir)/sync.c; else echo sync.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sync_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sync.c; then echo $(srcdir)/sync.c; else echo sync.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sync_.c || rm -f sync_.c
 touch_.c: touch.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/touch.c; then echo $(srcdir)/touch.c; else echo touch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > touch_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/touch.c; then echo $(srcdir)/touch.c; else echo touch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > touch_.c || rm -f touch_.c
 chgrp_.$(OBJEXT) chmod_.$(OBJEXT) chown_.$(OBJEXT) \
 chown-core_.$(OBJEXT) copy_.$(OBJEXT) cp_.$(OBJEXT) cp-hash_.$(OBJEXT) \
-dd_.$(OBJEXT) df_.$(OBJEXT) dircolors_.$(OBJEXT) du_.$(OBJEXT) \
-install_.$(OBJEXT) ln_.$(OBJEXT) ls_.$(OBJEXT) ls-dir_.$(OBJEXT) \
-ls-ls_.$(OBJEXT) ls-vdir_.$(OBJEXT) mkdir_.$(OBJEXT) mkfifo_.$(OBJEXT) \
-mknod_.$(OBJEXT) mv_.$(OBJEXT) remove_.$(OBJEXT) rm_.$(OBJEXT) \
-rmdir_.$(OBJEXT) shred_.$(OBJEXT) sync_.$(OBJEXT) touch_.$(OBJEXT) : \
-$(ANSI2KNR)
+dd_.$(OBJEXT) df_.$(OBJEXT) dircolors_.$(OBJEXT) djstart_.$(OBJEXT) \
+djutils_.$(OBJEXT) du_.$(OBJEXT) install_.$(OBJEXT) ln_.$(OBJEXT) \
+ls_.$(OBJEXT) ls-dir_.$(OBJEXT) ls-ls_.$(OBJEXT) ls-msdos_.$(OBJEXT) \
+ls-vdir_.$(OBJEXT) mkdir_.$(OBJEXT) mkfifo_.$(OBJEXT) mknod_.$(OBJEXT) \
+mv_.$(OBJEXT) remove_.$(OBJEXT) rm_.$(OBJEXT) rmdir_.$(OBJEXT) \
+shred_.$(OBJEXT) sync_.$(OBJEXT) touch_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -532,7 +600,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -548,56 +616,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPE
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/chgrp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/chmod$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/chown$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/chown-core$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/copy$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/cp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/cp-hash$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dd$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/df$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dircolors$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/du$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/install$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ln$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ls$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ls-dir$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ls-ls$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ls-vdir$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mkdir$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mkfifo$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mknod$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mv$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/remove$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/rm$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/rmdir$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/shred$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/sync$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/touch$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -606,7 +628,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -632,23 +658,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 	-test -z "$(BUILT_SOURCES)$(MAINTAINERCLEANFILES)" || rm -f $(BUILT_SOURCES) $(MAINTAINERCLEANFILES)
 clean: clean-am
 
@@ -659,11 +682,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -671,7 +694,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -685,18 +708,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	clean-krextra distclean distclean-compile distclean-depend \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-krextra distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 $(bin_PROGRAMS) $(libexec_PROGRAMS): ../lib/libfetish.a
@@ -704,7 +727,6 @@ $(bin_PROGRAMS) $(libexec_PROGRAMS): ../
 dircolors.h: dcgen dircolors.hin
 	$(PERL) -w -- $(srcdir)/dcgen $(srcdir)/dircolors.hin > $@-t
 	mv $@-t $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/src/chgrp.c	2001-01-07 09:19:44.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/chgrp.c	2002-06-11 13:41:48.000000000 +0000
@@ -100,14 +100,24 @@ parse_group (const char *name, gid_t *g)
       unsigned long int tmp_long;
 
       if (!ISDIGIT (*name))
-	error (1, 0, _("invalid group name %s"), quote (name));
-
-      s_err = xstrtoul (name, NULL, 0, &tmp_long, NULL);
-      if (s_err != LONGINT_OK)
-	STRTOL_FATAL_ERROR (name, _("group number"), s_err);
+	{
+	  
+#ifdef MSDOS
+	  /* Under MS-DOS we allow to give away files to ANY user.  */
+	  tmp_long = 2*getgid();	/* why twice, you ask? why not? */
+#else
+	  error (1, 0, _("invalid group name %s"), quote (name));
+#endif
+	}
+      else
+	{
+	  s_err = xstrtoul (name, NULL, 0, &tmp_long, NULL);
+	  if (s_err != LONGINT_OK)
+	    STRTOL_FATAL_ERROR (name, _("group number"), s_err);
 
-      if (tmp_long > MAXGID)
-	error (1, 0, _("invalid group number %s"), quote (name));
+	  if (tmp_long > MAXGID)
+	    error (1, 0, _("invalid group number %s"), quote (name));
+	}
 
       *g = tmp_long;
     }
--- /dev/c/develop/ports/orig/fileutils-4.1/src/copy.c	2001-01-13 15:49:42.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/copy.c	2002-06-11 13:41:48.000000000 +0000
@@ -423,8 +423,10 @@ same_file_ok (const char *src_path, cons
       /* If both the source and destination files are symlinks (and we'll
 	 know this here IFF preserving symlinks (aka xstat == lstat),
 	 then it's ok -- as long as they are distinct.  */
+#ifdef S_ISLNK
       if (S_ISLNK (src_sb->st_mode) && S_ISLNK (dst_sb->st_mode))
 	return ! same_name (src_path, dst_path);
+#endif
 
       src_sb_link = src_sb;
       dst_sb_link = dst_sb;
@@ -448,9 +450,11 @@ same_file_ok (const char *src_path, cons
 	 above, but with the addition of the unlink_dest_before_opening
 	 conjunct because otherwise, with two symlinks to the same target,
 	 we'd end up truncating the source file.  */
+#ifdef S_ISLNK
       if (S_ISLNK (src_sb_link->st_mode) && S_ISLNK (dst_sb_link->st_mode)
 	  && x->unlink_dest_before_opening)
 	return 1;
+#endif
     }
 
   /* The backup code ensures there's a copy, so it's ok to remove
@@ -489,13 +493,20 @@ same_file_ok (const char *src_path, cons
      the same file system, via `unlink (DST_PATH)' otherwise.
      It's also ok if they're distinct hard links to the same file.  */
   if ((x->move_mode || x->unlink_dest_before_opening)
-      && (S_ISLNK (dst_sb_link->st_mode)
+      && (
+#ifdef S_ISLNK
+	  S_ISLNK (dst_sb_link->st_mode)
+#else
+	  0
+#endif
 	  || (same_link && !same_name (src_path, dst_path))))
     return 1;
 
   /* If neither is a symlink, then it's ok as long as they aren't
      hard links to the same file.  */
+#ifdef S_ISLNK
   if (!S_ISLNK (src_sb_link->st_mode) && !S_ISLNK (dst_sb_link->st_mode))
+#endif
     {
       if (!SAME_INODE (*src_sb_link, *dst_sb_link))
 	return 1;
@@ -511,21 +522,31 @@ same_file_ok (const char *src_path, cons
   /* It's ok to remove a destination symlink.  But that works only when we
      unlink before opening the destination and when the source and destination
      files are on the same partition.  */
+#ifdef S_ISLNK
   if (x->unlink_dest_before_opening
       && S_ISLNK (dst_sb_link->st_mode))
     return dst_sb_link->st_dev == src_sb_link->st_dev;
+#endif
 
   if (x->xstat == lstat)
     {
+#ifdef S_ISLNK
       if ( ! S_ISLNK (src_sb_link->st_mode))
 	tmp_src_sb = *src_sb_link;
       else if (stat (src_path, &tmp_src_sb))
 	return 1;
+#else
+      tmp_src_sb = *src_sb_link;
+#endif
 
+#ifdef S_ISLNK
       if ( ! S_ISLNK (dst_sb_link->st_mode))
 	tmp_dst_sb = *dst_sb_link;
       else if (stat (dst_path, &tmp_dst_sb))
 	return 1;
+#else
+      tmp_dst_sb = *dst_sb_link;
+#endif
 
       if ( ! SAME_INODE (tmp_src_sb, tmp_dst_sb))
 	return 1;
@@ -670,6 +691,14 @@ copy_internal (const char *src_path, con
 		}
 	      if (!yesno ())
 		return (move_mode ? 1 : 0);
+#ifdef MSDOS
+	      /* Make it writable, so the copy will succeed.  */
+	      if (chmod (dst_path, 0200))
+		{
+		  error (0, errno, "%s", dst_path);
+		  return 1;
+		}
+#endif
 	    }
 
 	  if (move_mode)
@@ -1108,7 +1137,13 @@ copy_internal (const char *src_path, con
       utb.actime = src_sb.st_atime;
       utb.modtime = src_sb.st_mtime;
 
-      if (utime (dst_path, &utb))
+      if (utime (dst_path, &utb)
+#ifdef MSDOS
+	  /* MS-DOS doesn't allow to change timestamp of a directory :-(
+	   * If we try, we'll get an ugly error message.  */
+	  && !S_ISDIR (src_type)
+	 )
+#endif
 	{
 	  error (0, errno, _("preserving times for %s"), quote (dst_path));
 	  if (x->require_preserve)
--- /dev/c/develop/ports/orig/fileutils-4.1/src/cp.c	2001-02-03 16:48:34.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/cp.c	2002-06-11 13:41:48.000000000 +0000
@@ -280,8 +280,12 @@ re_protect (const char *const_dst_path, 
 
 	  if (utime (dst_path, &utb))
 	    {
+#ifndef MSDOS
+	      /* MS-DOS doesn't allow to change timestamp of a
+		 directory.  */
 	      error (0, errno, _("preserving times for %s"), quote (dst_path));
 	      return 1;
+#endif
 	    }
 	}
 
--- /dev/c/develop/ports/orig/fileutils-4.1/src/dd.c	2001-04-22 13:21:58.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/dd.c	2002-06-11 13:41:48.000000000 +0000
@@ -137,6 +137,10 @@ static uintmax_t r_truncate = 0;
 /* Output representation of newline and space characters.
    They change if we're converting to EBCDIC.  */
 static unsigned char newline_character = '\n';
+#ifdef MSDOS
+static unsigned char cr_character = '\r';
+static int pending_cr = 0;
+#endif
 static unsigned char space_character = ' ';
 
 /* Output buffer. */
@@ -660,12 +664,14 @@ only one conv in {ascii,ebcdic,ibm}, {lc
     {
       translate_charset (ascii_to_ebcdic);
       newline_character = ascii_to_ebcdic['\n'];
+      cr_character = ascii_to_ebcdic['\r'];
       space_character = ascii_to_ebcdic[' '];
     }
   else if (conversions_mask & C_IBM)
     {
       translate_charset (ascii_to_ibm);
       newline_character = ascii_to_ibm['\n'];
+      cr_character = ascii_to_ibm['\r'];
       space_character = ascii_to_ibm[' '];
     }
 }
@@ -831,6 +837,37 @@ copy_with_block (unsigned char const *bu
 
   for (i = nread; i; i--, buf++)
     {
+#ifdef MSDOS
+      /* This is more complicated for MS-DOS, because the line separator is
+       * CR-LF, not just LF. If we find a CR, we need to see if it's actually
+       * an MS-DOS newline or just a CR. */
+
+      /* Output the CR left from the previous buffer, if the first
+       * character of this buffer isn't a newline.  */
+      if (i == nread && pending_cr && *buf != newline_character)
+	{
+	  output_char (cr_character);
+	  pending_cr = 0;
+	  col++;
+	}
+
+      /* If we have CR-LF pair, lose the CR character too.  */
+      if (*buf == cr_character)
+	{
+	  if (i == 1)   /* last char, defer decision until next BUF */
+	    {
+	      pending_cr = 1;
+	      continue;
+	    }
+	  else if (buf[1] == newline_character)
+	    {
+	      buf++;
+	      i--;
+	      pending_cr = 0;
+	    }
+	}
+#endif /* MSDOS */
+
       if (*buf == newline_character)
 	{
 	  if (col < conversion_blocksize)
@@ -871,6 +908,10 @@ copy_with_unblock (unsigned char const *
 	{
 	  col = pending_spaces = 0; /* Wipe out any pending spaces.  */
 	  i--;			/* Push the char back; get it later. */
+#ifdef MSDOS
+	  /* Make DOS-style text file (we do BINARY I/O!).  */
+	  output_char (cr_character);
+#endif
 	  output_char (newline_character);
 	}
       else if (c == space_character)
@@ -1065,14 +1106,31 @@ dd_copy (void)
       /* If the final input line didn't end with a '\n', pad
 	 the output block to `conversion_blocksize' chars.  */
       unsigned int i;
+
+#ifdef MSDOS
+      /* Do we have a CR waiting to be output? See copy_with_block(). */
+      if (pending_cr)
+	{
+	  output_char (cr_character);
+	  pending_cr = 0;
+	  col++;
+	}
+#endif
+
       for (i = col; i < conversion_blocksize; i++)
 	output_char (space_character);
     }
 
   if ((conversions_mask & C_UNBLOCK) && col == conversion_blocksize)
-    /* Add a final '\n' if there are exactly `conversion_blocksize'
-       characters in the final record. */
-    output_char (newline_character);
+    {
+      /* Add a final '\n' if there are exactly `conversion_blocksize'
+	 characters in the final record. */
+#ifdef MSDOS
+      /* Make DOS-style text file (we do I/O in binary mode!).  */
+      output_char (cr_character);
+#endif
+      output_char (newline_character);
+    }
 
   /* Write out the last block. */
   if (oc != 0)
--- /dev/c/develop/ports/orig/fileutils-4.1/src/df.c	2000-11-23 15:13:52.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/df.c	2002-06-11 13:41:48.000000000 +0000
@@ -258,6 +258,9 @@ show_dev (const char *disk, const char *
   uintmax_t used;
   int negate_used;
   double pct = -1;
+#ifdef __DJGPP__
+  char real_drive_name[4];
+#endif
 
   if (me_remote && show_local_fs)
     return;
@@ -274,6 +277,24 @@ show_dev (const char *disk, const char *
      but statfs doesn't do that on most systems.  */
   stat_file = mount_point ? mount_point : disk;
 
+#ifdef __DJGPP__
+  /* JOINed disks seem like a directory on another disk.
+     We want to see the info about the real drive.  */
+  if (fstype && strcmp (fstype, "join") == 0)
+    {
+      struct stat real_drive_stats;
+
+      if (stat (stat_file, &real_drive_stats))
+	{
+          error (0, errno, "%s", stat_file);
+          exit_status = 1;
+          return;
+	}
+      sprintf (real_drive_name, "%c:/", real_drive_stats.st_dev + 'A');
+      stat_file = real_drive_name;
+    }
+#endif
+
   if (get_fs_usage (stat_file, disk, &fsu))
     {
       error (0, errno, "%s", quote (stat_file));
--- /dev/c/develop/ports/orig/fileutils-4.1/src/dircolors.c	2000-08-07 16:46:16.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/dircolors.c	2002-06-11 13:41:48.000000000 +0000
@@ -137,11 +137,23 @@ static enum Shell_syntax
 guess_shell_syntax (void)
 {
   char *shell;
+  char *dot;
+  char path[PATH_MAX];
 
   shell = getenv ("SHELL");
   if (shell == NULL || *shell == '\0')
     return SHELL_SYNTAX_UNKNOWN;
 
+#ifdef MSDOS
+  /* Fix up the MS-DOS path - \ -> /, etc. */
+  FIXPATH (shell, path);
+  shell = path;
+
+  /* Chop executable extensions off the shell name. */
+  dot = strrchr(shell, '.');
+  if ((dot != NULL) && (STREQ (dot, ".exe") || STREQ (dot, ".com")))
+    *dot = '\0';
+#endif  
   shell = base_name (shell);
 
   if (STREQ (shell, "csh") || STREQ (shell, "tcsh"))
@@ -258,6 +270,10 @@ dc_parse_stream (FILE *fp, const char *f
 
   /* Get terminal type */
   term = getenv ("TERM");
+#ifdef __DJGPP__
+  /* DJGPP port can always colorize, but TERM is not usually defined there. */
+  term = "console";
+#endif  
   if (term == NULL || *term == '\0')
     term = "none";
 
--- /dev/c/develop/ports/orig/fileutils-4.1/src/du.c	2000-11-18 19:54:30.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/du.c	2002-06-11 13:41:48.000000000 +0000
@@ -66,6 +66,12 @@
 #define AUTHORS \
   "Torbjorn Granlund, David MacKenzie, Larry McVoy, and Paul Eggert"
 
+#ifdef MSDOS
+#include <signal.h>
+static struct saved_cwd start_cwd;
+static RETSIGTYPE interrupt_handler ();
+#endif
+
 /* Initial number of entries in each hash table entry's table of inodes.  */
 #define INITIAL_HASH_MODULE 100
 
@@ -525,6 +531,34 @@ count_entry (const char *ent, int top, d
       if (opt_one_file_system && !top && last_dev != dir_dev)
 	return 0;		/* Don't enter a new file system.  */
 
+#ifdef MSDOS
+      /* Every drive has its own ``working directory''.  If we're about
+	 to change drive, we need to save and restore that directory to
+	 prevent side-effects.  To this end, we will first chdir to the
+	 working directory on that drive so it is remembered by save_cwd.  */
+      if (ent[1] == ':')
+	{
+	  char work_dir[4];
+
+	  work_dir[0] = ent[0];
+	  work_dir[1] = ':';
+	  work_dir[2] = '.';
+	  work_dir[3] = '\0';
+	  if (chdir (work_dir) < 0)
+	    {
+	      error (0, errno, _("cannot change to directory %s"), work_dir);
+	      exit_status = 1;
+	      return 0;
+	    }
+	}
+
+      if (save_cwd (&cwd_buf))
+	exit (1);
+
+      cwd = &cwd_buf;
+
+#else  /* !MSDOS */
+
 #ifndef S_ISLNK
 # define S_ISLNK(s) 0
 #endif
@@ -548,6 +582,8 @@ count_entry (const char *ent, int top, d
       else
 	cwd = NULL;
 
+#endif /* !MSDOS */
+
       if (chdir (ent) < 0)
 	{
 	  error (0, errno, _("cannot change to directory %s"),
@@ -572,6 +608,11 @@ count_entry (const char *ent, int top, d
 
       /* Remember the current path.  */
 
+#ifdef MSDOS
+      /* Avoid adding extra slash in the case of a root directory.  */
+      if (path->text[path->length-2] != ':'
+	  || path->text[path->length-1] != '/')
+#endif
       str_concatc (path, "/");
       pathlen = path->length;
 
@@ -588,6 +629,10 @@ count_entry (const char *ent, int top, d
       free (name_space);
       pop_dir (cwd, path->text);
 
+#ifdef MSDOS
+      /* Avoid printing excess slash in the case of a root directory.  */
+      if (path->text[pathlen-2] != ':')
+#endif      
       str_trunc (path, pathlen - 1); /* Remove the "/" we added.  */
       if (depth <= max_depth || top)
 	print_size (size, path->length > 0 ? path->text : "/");
@@ -612,6 +657,13 @@ du_files (char **files)
 {
   int i;			/* Index in FILES. */
 
+#ifdef MSDOS
+  /* We need to install a signal handler to make sure we return to
+   * the original directory even if we are aborted.  */
+  signal (SIGINT, interrupt_handler);
+  save_cwd (&start_cwd);
+#endif
+  
   for (i = 0; files[i]; i++)
     {
       char *arg;
@@ -621,6 +673,18 @@ du_files (char **files)
 
       /* Delete final slash in the argument, unless the slash is alone.  */
       s = strlen (arg) - 1;
+#ifdef MSDOS
+      if (s == 1 && arg[1] == ':')
+	{
+	  /* Make "d:" explicit so we don't have to handle it specially.  */
+	  char full_path[FILENAME_MAX+5];
+	  FIXPATH (arg, full_path);
+	  str_copyc (path, full_path);
+	}
+      else if (s == 2 && arg[2] == '/')
+	str_copyc (path, arg);	/* leave alone the slash in "d:/" */
+      else
+#endif      
       if (s != 0)
 	{
 	  if (arg[s] == '/')
@@ -792,3 +856,12 @@ main (int argc, char **argv)
 
   exit (exit_status);
 }
+
+#ifdef MSDOS
+static RETSIGTYPE
+interrupt_handler (void)
+{
+  restore_cwd (&start_cwd, _("starting directory"), NULL);
+  exit (1);
+}
+#endif
--- /dev/c/develop/ports/orig/fileutils-4.1/src/install.c	2000-12-25 11:07:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/install.c	2002-06-11 13:41:48.000000000 +0000
@@ -28,6 +28,11 @@
 #include <pwd.h>
 #include <grp.h>
 
+#ifdef __DJGPP__
+# include <process.h>
+# include <sys/system.h>
+#endif
+
 #include "system.h"
 #include "backupfile.h"
 #include "error.h"
@@ -390,6 +395,73 @@ static int
 install_file_in_file (const char *from, const char *to,
 		      const struct cp_options *x)
 {
+#ifdef __DJGPP__  
+  static char STUBIFY[] = "stubify.exe";
+  char *from_dot = strrchr(from, '.');
+
+  /* DJGPP executables need to be stubbed and to have a valid executable file
+   * extension, to be executable by some DOS shells (e.g. COMMAND.COM). */
+  if (!(from_dot
+	&& (STREQ (from_dot, ".exe") || STREQ (from_dot, ".com"))))
+    {
+      char *new_from, *new_to;
+      const _v2_prog_type *file_type;
+      int status;
+
+      file_type = _check_v2_prog(from, -1);
+      
+      if (file_type->valid)
+	{
+	  /* If FROM is a COFF executable, make a DOS program on the fly.
+	   * This makes Unix-born Makefiles happy. */
+	  if (file_type->exec_format == _V2_EXEC_FORMAT_COFF)
+	    {
+	      new_from = alloca (strlen (from) + 1 + 4);
+	      stpcpy (stpcpy (new_from, from), ".exe");
+	      /* Don't overwrite a stubified .exe if it already exists
+		 (it may have been stubedited to change default stub info).  */
+	      if (!__file_exists (new_from))
+		{
+		  status = spawnlp (P_WAIT, STUBIFY, STUBIFY,
+				    from, (char *) NULL);
+		  if (status == -1)
+		    error (1, errno, _("cannot run stubify"));
+		}
+	      from = new_from;
+	      new_to = alloca (strlen (to) + 1 + 4);
+	      stpcpy (stpcpy (new_to, to), ".exe");
+	      to = new_to;
+	    }
+	  /* If FROM is a COFF executable that already has a stub, then
+	   * make sure that TO has an executable extension. */
+	  else if (file_type->exec_format == _V2_EXEC_FORMAT_STUBCOFF)
+	    {
+	      new_to = alloca (strlen (to) + 1 + 4);
+	      stpcpy (stpcpy (new_to, to), ".exe");
+	      to = new_to;
+	    }
+	}
+      else
+	{
+	  unsigned short header[1];
+	  int fd;
+
+	  fd = open(from, O_RDONLY | O_BINARY);
+	  if (   (read(fd, header, sizeof(header)) == sizeof(header))
+	      && (header[0] == 0x5a4d) /* "MZ" */)
+	    {
+	      /* If FROM is any other DOS (MZ) format executable, then
+	       * make sure that TO has an executable extension. */
+	      /* FIXME: This does not distinguish between .exe and .com. */
+	      new_to = alloca (strlen (to) + 1 + 4);
+	      stpcpy (stpcpy (new_to, to), ".exe");
+	      to = new_to;
+	    }
+	  close(fd);
+	}
+    }
+#endif
+	
   if (copy_file (from, to, x))
     return 1;
   if (strip_files)
@@ -415,6 +487,12 @@ install_file_in_dir (const char *from, c
 
   from_base = base_name (from);
   to = path_concat (to_dir, from_base, NULL);
+#ifdef MSDOS
+  /* If we get "d:" in FROM, make "d:to_dir", not "d:/to_dir".  */
+  if (strlen (to_dir) == 2 && to_dir[1] == ':')
+    stpcpy (stpcpy (to, to_dir), from_base);
+  else
+#endif  
   ret = install_file_in_file (from, to, x);
   free (to);
   return ret;
@@ -519,6 +597,8 @@ change_timestamps (const char *from, con
    magic numbers vary so much from system to system that making
    it portable would be very difficult.  Not worth the effort. */
 
+#ifndef MSDOS
+
 static void
 strip (const char *path)
 {
@@ -544,6 +624,48 @@ strip (const char *path)
     }
 }
 
+#else  /* MSDOS */
+#ifdef __DJGPP__
+
+static char STRIP[]   = "strip.exe";
+
+static void
+strip (const char *path)
+{
+  const _v2_prog_type *file_type;
+  int status;
+
+  file_type = _check_v2_prog(path, -1);
+  status    = spawnlp (P_WAIT, STRIP, STRIP, path, (char *) NULL);
+
+  if (status == -1)
+    error (1, errno, _("cannot run strip"));
+
+  if (status != 0)
+    {
+      /* If `strip' failed on a stubbed executable, it may be because it does
+       * not understand/support the stub. Inform the user. */
+      if (   file_type->valid
+	  && (file_type->exec_format == _V2_EXEC_FORMAT_STUBCOFF))
+	{
+	  error (0, 0,
+		 "%s: Executable may have a non-standard stub, "
+		 "e.g. PMODE/DJ, CWSDSTUB",
+		 path);
+	}
+    }
+}
+
+#else  /* not __DJGPP__ */
+
+static void
+strip (const char *path)
+{
+}
+
+#endif /* __DJGPP__ */
+#endif /* MSDOS */
+
 /* Initialize the user and group ownership of the files to install. */
 
 static void
--- /dev/c/develop/ports/orig/fileutils-4.1/src/ln.c	2001-02-03 17:57:00.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/ln.c	2002-09-15 16:28:18.000000000 +0000
@@ -162,12 +162,14 @@ do_link (const char *source, const char 
 	  return 1;
 	}
 
+#ifdef S_ISLNK
       if (S_ISLNK (source_stats.st_mode))
 	{
 	  error (0, 0, _("%s: warning: making a hard link to a symbolic link\
  is not portable"),
 		 quote (source));
 	}
+#endif
 
       if (!hard_dir_link && S_ISDIR (source_stats.st_mode))
 	{
@@ -446,7 +448,11 @@ main (int argc, char **argv)
 	  dereference_dest_dir_symlinks = 0;
 	  break;
 	case 's':
-#ifdef S_ISLNK
+	  /* DJGPP has a semi-functional symlink function. This produces
+	   * pseudo-symlinks for executables. Allow use of this function
+	   * for backwards-compatibility with earlier versions
+	   * of the DJGPP port of fileutils. */
+#if defined(S_ISLNK) || defined(__DJGPP__)
 	  symbolic_link = 1;
 #else
 	  error (1, 0, _("symbolic links are not supported on this system"));
--- /dev/c/develop/ports/orig/fileutils-4.1/src/ls.c	2001-04-29 09:42:46.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/ls.c	2002-12-18 16:54:04.000000000 +0000
@@ -54,6 +54,9 @@
 #ifdef GWINSZ_IN_SYS_IOCTL
 # include <sys/ioctl.h>
 #endif
+#ifdef __DJGPP__
+# include <pc.h>
+#endif
 
 #ifdef WINSIZE_IN_PTEM
 # include <sys/stream.h>
@@ -234,6 +237,11 @@ struct fileinfo
 
     enum filetype filetype;
 
+#ifdef MSDOS
+    /* On MS-DOS we also get DOS-specific file attribute bits. */
+    int msdos_attribs;
+#endif
+
 #if USE_ACL
     /* For long listings, nonzero if the file has an access control list,
        otherwise zero.  */
@@ -266,6 +274,10 @@ time_t time ();
 char *getgroup ();
 char *getuser ();
 
+#ifdef MSDOS
+void dos_mode_string PARAMS ((int, char *));
+#endif
+
 static size_t quote_name PARAMS ((FILE *out, const char *name,
 				  struct quoting_options const *options));
 static char *make_link_path PARAMS ((const char *path, const char *linkname));
@@ -511,12 +523,19 @@ enum indicator_no
   {
     C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
     C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR
+#ifdef MSDOS
+    , C_LABEL			/* MSDOS volume label */
+#endif
   };
 
 static const char *const indicator_name[]=
   {
     "lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
-    "bd", "cd", "mi", "or", "ex", "do", NULL
+    "bd", "cd", "mi", "or", "ex", "do"
+#ifdef MSDOS
+    , "lb"			/* MSDOS volume label */
+#endif
+    , NULL
   };
 
 struct color_ext_type
@@ -543,6 +562,9 @@ static struct bin_str color_indicator[] 
     { 0, NULL },			/* or: Orphanned symlink: undefined */
     { LEN_STR_PAIR ("01;32") },		/* ex: Executable: bright green */
     { LEN_STR_PAIR ("01;35") }		/* do: Door: bright magenta */
+#ifdef MSDOS
+    , { LEN_STR_PAIR ("37;07") }	/* lb: Volume Label: black on white */
+#endif
   };
 
 /* FIXME: comment  */
@@ -666,6 +688,12 @@ enum
   TIME_OPTION
 };
 
+#ifdef MSDOS
+/* If non-zero, use DOS-style permission mode, and don't show UID and GID
+ * in long format. */
+static int msdos_long_format;
+#endif
+
 static struct option const long_options[] =
 {
   {"all", no_argument, 0, 'a'},
@@ -701,6 +729,9 @@ static struct option const long_options[
   {"time", required_argument, 0, TIME_OPTION},
   {"color", optional_argument, 0, COLOR_OPTION},
   {"block-size", required_argument, 0, BLOCK_SIZE_OPTION},
+#ifdef MSDOS
+  {"msdos-long-format", no_argument, 0, 'g'},
+#endif  
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},
   {NULL, 0, NULL, 0}
@@ -866,8 +897,12 @@ main (int argc, char **argv)
   i = decode_switches (argc, argv);
 
   if (print_with_color)
+    parse_ls_color ();
+
+  /* Test print_with_color again, because the call to parse_ls_color
+     may have just reset it -- e.g., if LS_COLORS is invalid.  */
+  if (print_with_color)
     {
-      parse_ls_color ();
       prep_non_filename_text ();
       /* Avoid following symbolic links when possible.  */
       if (color_indicator[C_ORPHAN].string != NULL
@@ -878,10 +913,28 @@ main (int argc, char **argv)
 
   format_needs_stat = sort_type == sort_time || sort_type == sort_size
     || format == long_format
+#ifdef __DJGPP__
+    /* We need to call set_stats_bits_for_ls(), if we're displaying in
+     * colour with the FSEXT in the DJGPP port. */
+    || print_with_color
+#endif
     || trace_links || trace_dirs || print_block_size || print_inode;
   format_needs_type = (format_needs_stat == 0
 		       && (print_with_color || indicator_style != none));
 
+#if defined(__DJGPP__) && !defined(_POSIX_SOURCE)
+  /* Some members of `struct stat' are very expensive to compute on
+   * MSDOS.  This requests the fastest `stat' operation for given
+   * combination of options; see `ls-msdos.c'.  It also sets
+   * the default flags for reading directory entries - by default
+   * we don't want to see hidden files. */
+  set_stat_bits_for_ls (sort_type == sort_time,
+			sort_type == sort_size || print_block_size,
+			format == long_format, msdos_long_format,
+			indicator_style != none, print_with_color,
+			all_files);
+#endif  /* __DJGPP__ && !_POSIX_SOURCE */
+  
   if (dired && format == long_format)
     {
       obstack_init (&dired_obstack);
@@ -1057,6 +1110,10 @@ decode_switches (int argc, char **argv)
   }
 #endif
 
+#ifdef __DJGPP__
+  line_length = ScreenCols ();
+#endif
+
   /* Using the TABSIZE environment variable is not POSIX-approved.
      Ignore it when POSIXLY_CORRECT is set.  */
   tabsize = 8;
@@ -1115,6 +1172,9 @@ decode_switches (int argc, char **argv)
 	  break;
 
 	case 'g':
+#ifdef MSDOS
+          msdos_long_format = 1;
+#endif	
 	  /* No effect.  For BSD compatibility. */
 	  break;
 
@@ -1599,6 +1659,11 @@ parse_ls_color (void)
 
   if ((p = getenv ("LS_COLORS")) == NULL || *p == '\0')
     return;
+  if (*p == '\0')
+    {
+      print_with_color = 0;
+      return;
+    }
 
   ext = NULL;
   strcpy (label, "??");
@@ -1910,6 +1975,13 @@ gobble_file (const char *name, enum file
       /* `path' is the absolute pathname of this file. */
       int val;
 
+#ifdef MSDOS
+      /* Any filename with a drive specification should be
+       * treated as an absolute pathname on MS-DOS.  */
+      if (name[0] && (name[1] == ':'))
+	path = (char *)name;
+      else
+#endif	    
       if (name[0] == '/' || dirname[0] == 0)
 	path = (char *) name;
       else
@@ -1936,6 +2008,27 @@ gobble_file (const char *name, enum file
 	   && 4 < acl (path, GETACLCNT, 0, NULL));
 #endif
 
+#ifdef MSDOS
+      /* Get the MS-DOS attribute bits if they requested them.  */
+      if (msdos_long_format && format == long_format)
+	{
+	  if (S_ISCHR (files[files_index].stat.st_mode))
+	    files[files_index].msdos_attribs = 0x20; /* Modified only */
+	  else if (S_ISLABEL (files[files_index].stat.st_mode))
+	    /* Argh!  `_chmod' fails for volume labels!!  */
+	    files[files_index].msdos_attribs = 0x28;
+	  else
+	    {
+	      char fullpath[PATH_MAX];
+
+	      FIXPATH (path, fullpath);
+	      files[files_index].msdos_attribs = _chmod (fullpath, 0, 0);
+	      if (files[files_index].msdos_attribs == -1)
+		files[files_index].msdos_attribs = 0x20;
+	    }
+	}
+#endif /* MSDOS */
+
       if (S_ISLNK (files[files_index].stat.st_mode)
 	  && (explicit_arg || format == long_format || check_symlink_color))
 	{
@@ -2062,6 +2155,13 @@ make_link_path (const char *path, const 
   if (linkname == 0)
     return 0;
 
+#ifdef MSDOS
+  /* Any filename with a drive specification should be
+   * treated as an absolute pathname on MS-DOS.  */
+  if (linkname[0] && (linkname[1] == ':'))
+    return xstrdup (linkname);
+#endif
+
   if (*linkname == '/')
     return xstrdup (linkname);
 
@@ -2107,6 +2207,12 @@ extract_dirs_from_files (const char *dir
     if ((files[i].filetype == directory || files[i].filetype == arg_directory)
 	&& (!recursive || !basename_is_dot_or_dotdot (files[i].name)))
       {
+#ifdef MSDOS
+	/* DOS-specific case of absolute pathnames.  */
+	if (files[i].name[0] && (files[i].name[1] == ':'))
+	  queue_directory (files[i].name, files[i].linkname);
+	else
+#endif
 	if (files[i].name[0] == '/' || dirname[0] == 0)
 	  {
 	    queue_directory (files[i].name, files[i].linkname);
@@ -2455,6 +2561,11 @@ print_long_format (const struct fileinfo
   struct tm *when_local;
   char *user_name;
 
+#ifdef MSDOS
+  if (msdos_long_format)
+    dos_mode_string (f->msdos_attribs, modebuf);
+  else
+#endif  /* MSDOS */  
 #if HAVE_ST_DM_MODE
   /* Cray DMF: look at the file's migrated, not real, status */
   mode_string (f->stat.st_dm_mode, modebuf);
@@ -2501,17 +2612,29 @@ print_long_format (const struct fileinfo
       p += strlen (p);
     }
 
+#ifdef MSDOS
+  if (msdos_long_format)
+    sprintf (p, "%s  ", modebuf);
+  else
+#endif  
   /* The last byte of the mode string is the POSIX
      "optional alternate access method flag".  */
   sprintf (p, "%s %3u ", modebuf, (unsigned int) f->stat.st_nlink);
   p += strlen (p);
 
-  user_name = (numeric_ids ? NULL : getuser (f->stat.st_uid));
-  if (user_name)
-    sprintf (p, "%-8.8s ", user_name);
-  else
-    sprintf (p, "%-8u ", (unsigned int) f->stat.st_uid);
-  p += strlen (p);
+#ifdef MSDOS
+  if (!msdos_long_format)
+    {
+#endif  
+      user_name = (numeric_ids ? NULL : getuser (f->stat.st_uid));
+      if (user_name)
+	sprintf (p, "%-8.8s ", user_name);
+      else
+	sprintf (p, "%-8u ", (unsigned int) f->stat.st_uid);
+      p += strlen (p);
+#ifdef MSDOS
+    }
+#endif  
 
   if (!inhibit_group)
     {
@@ -2529,8 +2652,15 @@ print_long_format (const struct fileinfo
   else
     {
       char hbuf[LONGEST_HUMAN_READABLE + 1];
+      uintmax_t size = f->stat.st_size;
+
+      /* POSIX requires that the size be printed without a sign, even
+	 when negative.  Assume the typical case where negative sizes
+	 are actually positive values that have wrapped around.  */
+      size += (f->stat.st_size < 0) * ((uintmax_t) OFF_T_MAX - OFF_T_MIN + 1);
+
       sprintf (p, "%8s ",
-	       human_readable ((uintmax_t) f->stat.st_size, hbuf, 1,
+	       human_readable (size, hbuf, 1,
 			       output_block_size < 0 ? output_block_size : 1));
     }
 
@@ -2858,6 +2988,12 @@ print_type_indicator (unsigned int mode)
 	c = '=';
       else if (S_ISDOOR (mode))
 	c = '>';
+#ifdef MSDOS
+#ifdef S_ISLABEL     /* MS-DOS Volume label */
+      else if (S_ISLABEL (mode))
+	c = '+';
+#endif
+#endif
       else
 	c = 0;
     }
@@ -2897,6 +3033,12 @@ print_color_indicator (const char *name,
 	type = C_CHR;
       else if (S_ISDOOR (mode))
 	type = C_DOOR;
+#ifdef MSDOS
+#ifdef S_ISLABEL     /* MS-DOS Volume label */
+      else if (S_ISLABEL (mode))
+	type = C_LABEL;
+#endif
+#endif
 
       if (type == C_FILE && (mode & S_IXUGO) != 0)
 	type = C_EXEC;
@@ -2912,7 +3054,13 @@ print_color_indicator (const char *name,
 	  for (ext = color_ext_list; ext != NULL; ext = ext->next)
 	    {
 	      if ((size_t) ext->ext.len <= len
+#ifdef MSDOS
+		  /* Don't let the letter case affect the colorization on
+		   * MSDOS. */
+		  && strncasecmp (name - ext->ext.len, ext->ext.string,
+#else		  
 		  && strncmp (name - ext->ext.len, ext->ext.string,
+#endif
 			      ext->ext.len) == 0)
 		break;
 	    }
@@ -2965,6 +3113,11 @@ length_of_file_name_and_frills (const st
 	       || S_ISFIFO (filetype)
 	       || S_ISSOCK (filetype)
 	       || S_ISDOOR (filetype)
+#ifdef MSDOS
+#ifdef S_ISLABEL
+	       || S_ISLABEL (filetype)
+#endif
+#endif
 	       )
 	len += 1;
     }
@@ -3200,6 +3353,11 @@ attach (char *dest, const char *dirname,
     {
       while (*dirnamep)
 	*dest++ = *dirnamep++;
+#ifdef MSDOS
+      /* "d:" does NOT mean "d:/"  */
+      if (dirnamep <= dirname + 1
+	  || dirname[1] != ':' || dirname[2] != '\0')
+#endif
       /* Add '/' if `dirname' doesn't already end with it. */
       if (dirnamep > dirname && dirnamep[-1] != '/')
 	*dest++ = '/';
--- /dev/c/develop/ports/orig/fileutils-4.1/src/mv.c	2001-02-03 16:48:34.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/mv.c	2002-06-11 13:41:50.000000000 +0000
@@ -271,9 +271,33 @@ static int
 movefile (char *source, char *dest, int dest_is_dir,
 	  const struct cp_options *x)
 {
-  int dest_had_trailing_slash = strip_trailing_slashes_2 (dest);
+#ifdef MSDOS
+  char source_fixed[PATH_MAX], dest_fixed[PATH_MAX];
+#endif
+  int dest_had_trailing_slash;
   int fail;
 
+  dest_had_trailing_slash = strip_trailing_slashes_2 (dest);
+
+#ifdef MSDOS
+  /* On MS-DOS, fix up paths like 'd:t.t' into an absolute path. MS-DOS also
+   * has one working directory per drive. Hence, the trailing slash check was
+   * moved to after this code, because 'd:' may become 'd:/' if it's the
+   * current working directory on d:. However, only do the fix-up if there
+   * is a drive letter without a path. */
+  if ((source[1] == ':') && (source[2] != '/'))
+    {
+      FIXPATH (source, source_fixed);
+      source = source_fixed;
+    }
+
+  if ((dest[1] == ':') && (dest[2] != '/'))
+    {
+      FIXPATH (dest, dest_fixed);
+      dest = dest_fixed;
+    }
+#endif
+
   /* This code was introduced to handle the ambiguity in the semantics
      of mv that is induced by the varying semantics of the rename function.
      Some systems (e.g., Linux) have a rename function that honors a
--- /dev/c/develop/ports/orig/fileutils-4.1/src/remove.c	2001-02-18 16:17:32.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/remove.c	2003-08-30 23:40:08.000000000 +0000
@@ -718,6 +718,11 @@ remove_dir (struct File_spec *fs, int ne
      command remove some other directory belonging to Bob.  The method
      would be to replace an existing lstat'd but-not-yet-removed directory
      with a symlink to the target directory.  */
+  /*
+   * <rich@phekda.freeserve.co.uk>: Disable this check for DJGPP for now,
+   * because it causes problems on Windows 2000 and XP.
+   */
+#ifndef __DJGPP__
   {
     struct stat sb;
     if (lstat (".", &sb))
@@ -739,6 +744,7 @@ was replaced with either another directo
 	       (unsigned long)(sb.st_ino));
       }
   }
+#endif /* __DJGPP__ */
 
   push_dir (dir_name);
 
@@ -885,6 +891,25 @@ The following two directories have the s
       if (! hash_insert (active_dir_map, new_ent))
 	xalloc_die ();
     }
+#elif defined(D_TYPE_IN_DIRENT) && !defined(D_INO_IN_DIRENT)
+  /* DJGPP CVS supports the d_type field in struct dirent, but not d_ino.
+   * The fspec_init_dp function will therefore set the has_filetype_mode
+   * field in `fs', but leave the other fields blank. Later uses
+   * of the fspec_get_filetype_mode function will therefore not complete
+   * the device fields in `fs'.
+   *
+   * The remove_dir function expects the device information to be complete.
+   * So, we complete it here.
+   */
+  if (S_ISDIR (filetype_mode))
+    {
+      if (fspec_get_device_number (fs))
+	{
+	  error (0, errno, _("cannot stat %s"),
+		 quote (full_filename (fs->filename)));
+	  return RM_ERROR;
+	}
+    }
 #endif
 
   if (!S_ISDIR (filetype_mode) || x->unlink_dirs)
@@ -895,12 +920,52 @@ The following two directories have the s
     {
       int need_save_cwd = user_specified_name;
       enum RM_status status;
+#ifdef MSDOS
+      struct saved_cwd cwd;
+#endif /* MSDOS */
 
       if (need_save_cwd)
 	need_save_cwd = (strchr (fs->filename, '/') != NULL);
 
+#ifdef MSDOS
+      /* If a drive letter is specified, we need to save the cwd.
+       * Then we change onto the drive specified. This way we preserve
+       * the working directory on the current drive. We also preserve
+       * the working directory on the drive where the directory resides,
+       * by setting need_save_cwd. */
+      if (fs->filename[0] && fs->filename[1] == ':')
+	{
+	  char newdrive[3];
+
+	  need_save_cwd = 1;
+	  if (save_cwd (&cwd))
+	    return(RM_ERROR);
+
+	  strncpy(newdrive, fs->filename, 2);
+	  newdrive[2] = '\0';
+	  if (chdir(newdrive) < 0)
+	    {
+	      free_cwd(&cwd);
+	      return(RM_ERROR);
+	    }
+	}
+#endif /* MSDOS */
+
       status = remove_dir (fs, need_save_cwd, x);
 
+#ifdef MSDOS
+      /* Return to the original drive & working directory. */
+      if (fs->filename[1] == ':')
+	{
+	  if (restore_cwd (&cwd, NULL, NULL))
+	    {
+	      free_cwd (&cwd);
+	      return RM_ERROR;
+	    }
+	  free_cwd (&cwd);
+	}
+#endif /* MSDOS */
+
 #ifdef ENABLE_CYCLE_CHECK
       {
 	struct active_dir_ent tmp;
--- /dev/c/develop/ports/orig/fileutils-4.1/src/rm.c	2001-04-29 06:56:24.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/rm.c	2002-06-11 13:41:50.000000000 +0000
@@ -127,6 +127,7 @@ rm_option_init (struct rm_options *x)
 int
 main (int argc, char **argv)
 {
+  char *pathname;
   struct rm_options x;
   int fail = 0;
   int c;
@@ -182,17 +183,36 @@ main (int argc, char **argv)
 	}
     }
 
+#ifdef __DJGPP__
+  /* If they said `rm -r', let us find hidden files also,
+   * otherwise we cannot remove directories with such files.  */
+  if (x.recursive)
+    __opendir_flags |= __OPENDIR_FIND_HIDDEN;
+#endif
+
   remove_init ();
 
   for (; optind < argc; optind++)
     {
       struct File_spec fs;
       enum RM_status status;
+#ifdef MSDOS
+      char fullname[PATH_MAX + 1];
+#endif
 
       /* Stripping slashes is harmless for rmdir;
 	 if the arg is not a directory, it will fail with ENOTDIR.  */
-      strip_trailing_slashes (argv[optind]);
-      fspec_init_file (&fs, argv[optind]);
+      pathname = argv[optind];
+      strip_trailing_slashes (pathname);
+#ifdef MSDOS
+      /* pathname = "d:" means current dir on drive d:  */
+      if (pathname[0] && pathname[1] == ':' && pathname[2] == '\0')
+	{
+	  FIXPATH (pathname, fullname);	/* convert into an absolute pathname */
+	  pathname = fullname;
+	}
+#endif
+      fspec_init_file (&fs, pathname);
       status = rm (&fs, 1, &x);
       assert (VALID_STATUS (status));
       if (status == RM_ERROR)
--- /dev/c/develop/ports/orig/fileutils-4.1/src/sys2.h	2001-03-17 09:22:30.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/sys2.h	2002-06-11 13:41:48.000000000 +0000
@@ -279,7 +279,22 @@ char *alloca ();
 #endif
 #define N_(Text) Text
 
-#define STREQ(a, b) (strcmp ((a), (b)) == 0)
+#ifdef MSDOS
+/* MSDOS and compatible systems are case-insensitive in filenames.  */
+# define STREQ(a,b) (strcasecmp((a), (b)) == 0)
+/* Define a way to convert a pathname into absolute form.
+   Examples:
+               file		-> d:/dir/subdir/file
+	       d:path		-> d:/curdir/path
+	       /dir/subdir	-> x:/dir/subdir              */     
+# ifdef __DJGPP__
+#  define FIXPATH(x,y)  _fixpath(x,y)
+# else  /* !__DJGPP__ */
+#  error FIXPATH macro not defined on MSDOS!
+# endif /* !__DJGPP__ */
+#else  /* !MSDOS */
+# define STREQ(a,b) (strcmp((a), (b)) == 0)     
+#endif /* !MSDOS */
 
 #if !HAVE_DECL_FREE
 void free ();
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/Makefile.am	2000-12-31 09:39:20.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/Makefile.am	2002-06-11 13:41:50.000000000 +0000
@@ -4,7 +4,7 @@ TESTS = help-version
 TESTS_ENVIRONMENT = \
   all_programs="$(bin_SCRIPTS) $(bin_PROGRAMS)"
 
-EXTRA_DIST = Fetish.pm .env-warn envvar-check lang-default \
+EXTRA_DIST = Fetish.pm env-warn.txt envvar-check lang-default \
   expensive rwx-to-mode setgid-check group-names $(TESTS)
 SUBDIRS = chgrp chmod cp dd du dircolors install ln ls ls-2 mkdir mv \
   rm rmdir shred touch
@@ -19,9 +19,9 @@ check-recursive: envvar-check root-hint
 # Warn when `make check' is run with POSIXLY_CORRECT or CDPATH set.
 envvar-check:
 	test "$${POSIXLY_CORRECT+set}" = set \
-	  && sed s/%%/POSIXLY_CORRECT/ $(srcdir)/.env-warn || :
+	  && sed s/%%/POSIXLY_CORRECT/ $(srcdir)/env-warn.txt || :
 	test "$${CDPATH+set}" = set \
-	  && sed s/%%/CDPATH/ $(srcdir)/.env-warn || :
+	  && sed s/%%/CDPATH/ $(srcdir)/env-warn.txt || :
 
 # Advertise `check-root' target.
 root-hint:
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,50 +104,50 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 TESTS = help-version
 TESTS_ENVIRONMENT = \
   all_programs="$(bin_SCRIPTS) $(bin_PROGRAMS)"
 
 
-EXTRA_DIST = Fetish.pm .env-warn envvar-check lang-default \
+EXTRA_DIST = Fetish.pm env-warn.txt envvar-check lang-default \
   expensive rwx-to-mode setgid-check group-names $(TESTS)
 
 SUBDIRS = chgrp chmod cp dd du dircolors install ln ls ls-2 mkdir mv \
   rm rmdir shred touch
 
-EXEEXT =
-OBJEXT = o
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = Makefile.am Makefile.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  tests/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  tests/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -159,10 +155,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_b
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -227,9 +220,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -243,13 +236,13 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -263,6 +256,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -278,9 +272,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -300,6 +297,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -310,7 +313,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -337,7 +344,6 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile
-
 installdirs: installdirs-recursive
 installdirs-am:
 
@@ -350,23 +356,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
@@ -375,11 +378,11 @@ distclean: distclean-recursive
 
 distclean-am: clean-am distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-recursive
 
 dvi-am:
 
-info:
+info: info-recursive
 
 info-am:
 
@@ -387,7 +390,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-recursive
 
 install-man:
 
@@ -401,19 +404,24 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-.PHONY: all all-am all-recursive check check-TESTS check-am \
-	check-recursive clean clean-generic clean-recursive distclean \
-	distclean-generic distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-TESTS check-am \
+	clean clean-generic clean-recursive distclean distclean-generic \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
 	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-recursive install-man \
+	install-info install-info-am install-info-recursive install-man \
 	install-recursive install-strip installcheck installcheck-am \
-	installcheck-recursive installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-recursive tags tags-recursive uninstall \
-	uninstall-am uninstall-info-recursive uninstall-recursive
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive
 
 
 check-root:
@@ -426,9 +434,9 @@ check-recursive: envvar-check root-hint
 # Warn when `make check' is run with POSIXLY_CORRECT or CDPATH set.
 envvar-check:
 	test "$${POSIXLY_CORRECT+set}" = set \
-	  && sed s/%%/POSIXLY_CORRECT/ $(srcdir)/.env-warn || :
+	  && sed s/%%/POSIXLY_CORRECT/ $(srcdir)/env-warn.txt || :
 	test "$${CDPATH+set}" = set \
-	  && sed s/%%/CDPATH/ $(srcdir)/.env-warn || :
+	  && sed s/%%/CDPATH/ $(srcdir)/env-warn.txt || :
 
 # Advertise `check-root' target.
 root-hint:
@@ -437,7 +445,6 @@ root-hint:
 	@echo "        run as root. Do \`make check-root'"
 	@echo "        as \`root' to run just these tests."
 	@echo '********************************************'
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/chgrp/Makefile.am	2000-12-15 14:44:08.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/chgrp/Makefile.am	2002-06-11 13:41:50.000000000 +0000
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = basic deref recurse
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/chgrp/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/chgrp/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,51 +104,46 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.4 gnits
 
 TESTS = basic deref recurse
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/chgrp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/chgrp/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -166,6 +157,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -181,9 +173,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -203,6 +198,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -213,7 +214,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -239,23 +244,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -264,11 +266,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -276,7 +278,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -290,14 +292,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/chmod/Makefile.am	2001-01-01 10:51:08.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/chmod/Makefile.am	2002-06-11 13:41:50.000000000 +0000
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = equal-x c-option setgid
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/chmod/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/chmod/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,51 +104,46 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.4 gnits
 
 TESTS = equal-x c-option setgid
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/chmod
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/chmod/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -166,6 +157,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -181,9 +173,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -203,6 +198,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -213,7 +214,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -239,23 +244,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -264,11 +266,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -276,7 +278,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -290,14 +292,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/cp/Makefile.am	2001-01-10 09:54:44.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/cp/Makefile.am	2002-06-11 13:41:50.000000000 +0000
@@ -2,11 +2,11 @@
 AUTOMAKE_OPTIONS = 1.1 gnits
 
 TESTS = \
-  backup-1 no-deref-link1 no-deref-link2 no-deref-link3 backup-is-src \
+  backup-1 nderefl1 nderefl2 nderefl3 backup-is-src \
   same-file cp-mv-backup symlink-slash slink-2-slink fail-perm dir-slash \
   perm cp-HL special-bits link dir-rm-dest cp-parents deref-slink \
   dir-vs-file into-self
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/cp/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/cp/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,21 +104,20 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.1 gnits
 
 TESTS = \
-  backup-1 no-deref-link1 no-deref-link2 no-deref-link3 backup-is-src \
+  backup-1 nderefl1 nderefl2 nderefl3 backup-is-src \
   same-file cp-mv-backup symlink-slash slink-2-slink fail-perm dir-slash \
   perm cp-HL special-bits link dir-rm-dest cp-parents deref-slink \
   dir-vs-file into-self
@@ -130,35 +125,31 @@ TESTS = \
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   MAKE=$(MAKE) \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/cp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/cp/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -172,6 +163,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -187,9 +179,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -209,6 +204,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -219,7 +220,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -245,23 +250,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -270,11 +272,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -282,7 +284,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -296,14 +298,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/cp/fail-perm	2000-06-25 20:19:30.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/cp/fail-perm	2002-06-11 13:41:50.000000000 +0000
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if test "$VERBOSE" = yes; then
+  set -x
+  cp --version
+fi
+
 pwd=`pwd`
 tmp=fail-perm.$$
 trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/cp/into-self	2001-01-10 10:29:56.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/cp/into-self	2002-06-11 16:01:34.000000000 +0000
@@ -34,12 +34,16 @@ fail=0
 # This command should exit nonzero.
 cp -R dir dir 2> out && fail=1
 
+sed "s,cp:,XXX:," out > out2
+
 cat > exp <<\EOF
-cp: cannot copy a directory, `dir', into itself, `dir/dir'
+XXX: cannot copy a directory, `dir', into itself, `dir/dir'
 EOF
 #'
 
-cmp out exp || fail=1
-test $fail = 1 && diff out exp 2> /dev/null
+cmp out2 exp || fail=1
+test $fail = 1 && diff out2 exp 2> /dev/null
+
+rm -f out out2 exp
 
 (exit $fail); exit
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/cp/same-file	2000-10-21 20:45:02.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/cp/same-file	2002-06-11 22:49:04.000000000 +0000
@@ -63,14 +63,14 @@ for args in 'foo symlink' 'symlink foo' 
     (
       (
 	# echo 1>&2 cp $options $args
-	cp $options $args 2>.err
+	cp $options $args 2>_err
 	echo $? $options
 
 	# Normalize the program name in the error output,
 	# and put brackets around the output.
-	test -s .err && echo "[`sed 's/^[^:][^:]*:/cp:/' .err`]"
+	test -s _err && echo "[`sed 's/^[^:][^:]*:/cp:/' _err`]"
 	# Strip off all but the file names.
-	ls="`ls -lG --ignore=.err . \
+	ls="`ls -lG --ignore=_err . \
 	    | sed \
 	        -e '/^total /d' \
 		-e 's/^...............................................//'`"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/dd/Makefile.am	2000-12-02 11:36:26.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/dd/Makefile.am	2002-06-11 13:44:06.000000000 +0000
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=dd
 
-TESTS = misc not-rewound skip-seek skip-seek2
+TESTS = misc not-rewound skpseek skpseek2
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/dd/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/dd/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,55 +104,50 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=dd
 
 
-TESTS = misc not-rewound skip-seek skip-seek2
-EXEEXT =
-OBJEXT = o
+TESTS = misc not-rewound skpseek skpseek2
 subdir = tests/dd
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  tests/dd/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  tests/dd/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -170,6 +161,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -185,9 +177,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -207,6 +202,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -217,7 +218,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -243,23 +248,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -268,11 +270,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -280,7 +282,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -294,14 +296,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/dircolors/Makefile.am	2000-01-07 08:53:04.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/dircolors/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=dircolors
 
 TESTS = simple
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/dircolors/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/dircolors/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,55 +104,50 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=dircolors
 
 
 TESTS = simple
-EXEEXT =
-OBJEXT = o
 subdir = tests/dircolors
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  tests/dircolors/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  tests/dircolors/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -170,6 +161,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -185,9 +177,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -207,6 +202,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -217,7 +218,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -243,23 +248,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -268,11 +270,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -280,7 +282,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -294,14 +296,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/du/Makefile.am	2000-04-27 12:06:06.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/du/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = two-args
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/du/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/du/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,51 +104,46 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.4 gnits
 
 TESTS = two-args
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/du
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/du/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -166,6 +157,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -181,9 +173,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -203,6 +198,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -213,7 +214,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -239,23 +244,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -264,11 +266,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -276,7 +278,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -290,14 +292,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/install/Makefile.am	2000-02-27 14:10:56.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/install/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.3 gnits
 TESTS = basic-1 create-leading
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH" EXEEXT=$(EXEEXT)
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/install/Makefile.in	2001-04-29 08:25:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/install/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,51 +104,46 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = basic-1 create-leading
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH" EXEEXT=$(EXEEXT)
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/install
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/install/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -166,6 +157,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -181,9 +173,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -203,6 +198,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -213,7 +214,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -239,23 +244,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -264,11 +266,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -276,7 +278,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -290,14 +292,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/install/basic-1	2001-03-17 22:18:24.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/install/basic-1	2002-06-11 13:41:52.000000000 +0000
@@ -34,7 +34,7 @@ test -f $file || fail=1
 test -f $dir/$file || fail=1
 
 # Make sure strip works.
-cp ../../../src/dd .
+cp ../../../src/dd$EXEEXT dd
 cp dd dd2
 
 strip dd2 || \
@@ -51,10 +51,14 @@ EOF
 # don't work on read-only files (the one from binutils works fine).
 ginstall -s -c -m 555 dd $dir || fail=1
 # Make sure the dest file has been created.
-test -f dd || fail=1
+#
+# NB: The DJGPP port of install does magic things to executables, i.e.:
+# it will rename the file to include a '.exe', if it's executable,
+# to ensure it has the correct file extension. So, look for the right file.
+test -f $dir/dd$EXEEXT || fail=1
 
 # ...and that the permissions are as requested.
-set X `ls -l $dir/dd`
+set X `ls -l $dir/dd$EXEEXT`
 shift
 test "$1" = -r-xr-xr-x || fail=1
 
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ln/Makefile.am	1999-01-18 17:02:30.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ln/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 TESTS = sf-1 misc backup-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ln/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ln/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,51 +104,46 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.2 gnits
 
 TESTS = sf-1 misc backup-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/ln
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/ln/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -166,6 +157,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -181,9 +173,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -203,6 +198,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -213,7 +214,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -239,23 +244,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -264,11 +266,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -276,7 +278,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -290,14 +292,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ls/Makefile.am	2001-04-22 09:07:46.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ls/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -7,5 +7,5 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=ls
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ls/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ls/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,17 +104,16 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.2 gnits
 
 TESTS = rt-1 time-1 symlink-slash follow-slink no-arg
@@ -126,36 +121,32 @@ EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=ls
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/ls
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/ls/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -169,6 +160,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -184,9 +176,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -206,6 +201,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -216,7 +217,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -242,23 +247,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -267,11 +269,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -279,7 +281,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -293,14 +295,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ls/time-1	2000-10-28 12:36:02.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ls/time-1	2002-06-11 13:41:52.000000000 +0000
@@ -32,7 +32,7 @@ touch -m -d "$t1" c || framework_failure
 touch -a -d "$u3" c || framework_failure=1
 touch -a -d "$u2" b || framework_failure=1
 # Make sure A has ctime at least 1 second more recent than C's.
-sleep 2
+sleep 5
 touch -a -d "$u1" a || framework_failure=1
 
 fail=0
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ls-2/Makefile.am	2000-01-07 08:53:04.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ls-2/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -6,7 +6,7 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=ls
 
 TESTS = tests
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/ls-2/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/ls-2/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,55 +104,50 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=ls
 
 
 TESTS = tests
-EXEEXT =
-OBJEXT = o
 subdir = tests/ls-2
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  tests/ls-2/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  tests/ls-2/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -170,6 +161,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -185,9 +177,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -207,6 +202,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -217,7 +218,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -243,23 +248,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -268,11 +270,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -280,7 +282,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -294,14 +296,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mkdir/Makefile.am	2000-11-18 13:39:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mkdir/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -5,4 +5,4 @@ TESTS = p-1 p-2 special-1 perm parents t
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   srcdir=$(srcdir) \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mkdir/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mkdir/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,52 +104,47 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.1 gnits
 
 TESTS = p-1 p-2 special-1 perm parents t-slash
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   srcdir=$(srcdir) \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/mkdir
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/mkdir/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -167,6 +158,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -182,9 +174,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -204,6 +199,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -214,7 +215,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -240,23 +245,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -265,11 +267,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -277,7 +279,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -291,14 +293,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/Makefile.am	2001-01-14 11:06:04.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
 AUTOMAKE_OPTIONS = 1.3 gnits
 
-TESTS = i-2 mv-special-1 into-self into-self-2 into-self-3 into-self-4 \
+TESTS = i-2 mv-special-1 to-self to-self2 to-self3 to-self4 \
   backup-is-src \
   i-1 hard-link-1 force partition-perm to-symlink dir-file diag \
   part-symlink part-rename trailing-slash
@@ -9,5 +9,5 @@ TESTS = i-2 mv-special-1 into-self into-
 EXTRA_DIST = $(TESTS) setup
 TESTS_ENVIRONMENT = \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=mv
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/Makefile.in	2002-06-11 14:19:24.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,20 +104,19 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.3 gnits
 
-TESTS = i-2 mv-special-1 into-self into-self-2 into-self-3 into-self-4 \
+TESTS = i-2 mv-special-1 to-self to-self2 to-self3 to-self4 \
   backup-is-src \
   i-1 hard-link-1 force partition-perm to-symlink dir-file diag \
   part-symlink part-rename trailing-slash
@@ -130,36 +125,32 @@ TESTS = i-2 mv-special-1 into-self into-
 EXTRA_DIST = $(TESTS) setup
 TESTS_ENVIRONMENT = \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=mv
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/mv
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/mv/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -173,6 +164,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -188,9 +180,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -210,6 +205,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -220,7 +221,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -246,23 +251,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -271,11 +273,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -283,7 +285,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -297,14 +299,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/diag	2000-10-28 13:49:18.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/diag	2002-06-11 16:03:58.000000000 +0000
@@ -38,18 +38,20 @@ mv no-file >> out 2>&1 && fail=1
 mv f1 f2 f1 >> out 2>&1 && fail=1
 mv --target=f2 f1 >> out 2>&1 && fail=1
 
+sed -e "s,mv,XXX," out > out2
+
 cat > exp <<\EOF
-mv: missing file argument
-Try `mv --help' for more information.
-mv: missing file argument
-Try `mv --help' for more information.
-mv: when moving multiple files, last argument must be a directory
-Try `mv --help' for more information.
-mv: specified target, `f2' is not a directory
-Try `mv --help' for more information.
+XXX: missing file argument
+Try `XXX --help' for more information.
+XXX: missing file argument
+Try `XXX --help' for more information.
+XXX: when moving multiple files, last argument must be a directory
+Try `XXX --help' for more information.
+XXX: specified target, `f2' is not a directory
+Try `XXX --help' for more information.
 EOF
 
-cmp out exp || fail=1
+cmp out2 exp || fail=1
 
 (exit $fail)
 exit $fail
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/force	2000-10-21 20:43:14.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/force	2002-06-12 00:58:18.000000000 +0000
@@ -6,8 +6,8 @@ if test "$VERBOSE" = yes; then
   mv --version
 fi
 
-ff=force-file
-ff2=force-file-2
+ff=forcef
+ff2=forcef2
 
 framework_failure=0
 rm -f $ff $ff2 || framework_failure=1
@@ -25,17 +25,19 @@ fi
 # This mv command should exit nonzero.
 mv $ff $ff > out 2>&1 && fail=1
 
+sed -e "s,mv:,XXX:," out > out2
+
 cat > exp <<EOF
-mv: \`$ff' and \`$ff' are the same file
+XXX: \`$ff' and \`$ff' are the same file
 EOF
 
-cmp out exp || fail=1
+cmp out2 exp || fail=1
 test `cat $ff` = force-contents || fail=1
 
 # This should succeed, even though the source and destination
 # device and inodes are the same.
 mv $ff $ff2 || fail=1
 
-rm -fr out exp $ff $ff2
+rm -fr out out2 exp $ff $ff2
 
 exit $fail
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/i-2	2000-10-21 20:42:38.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/i-2	2002-06-11 16:05:32.000000000 +0000
@@ -53,6 +53,8 @@ cp -if e f < y > out 2>&1 || fail=1
 # Make sure out contains the prompt.
 case "`cat out`" in
   "cp: overwrite \`f', overriding mode 0000?"*) ;;
+# MS-DOS doesn't support removing the read attribute from files.
+  "cp: overwrite \`f', overriding mode 0444?"*) ;;
   *) fail=1 ;;
 esac
 
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/mv-special-1	2000-12-08 19:19:08.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/mv-special-1	2002-06-11 13:41:52.000000000 +0000
@@ -19,14 +19,16 @@ if test -z "$other_partition_tmpdir"; th
   (exit 77); exit
 fi
 
-null=.mv-null
-dir=.mv-dir
+null=mv-null
+dir=mv-dir
 
 framework_failure=0
 mkdir $tmp || framework_failure=1
 cd $tmp || framework_failure=1
 rm -f $null || framework_failure=1
-mknod $null p || framework_failure=1
+# MS-DOS doesn't support FIFOs, so just create a normal file.
+#mknod $null p || framework_failure=1
+touch $null || framework_failure=1
 mkdir -p $dir/a/b/c $dir/d/e/f || framework_failure=1
 touch $dir/a/b/c/file1 $dir/d/e/f/file2 || framework_failure=1
 
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/part-symlink	2000-10-21 20:41:22.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/part-symlink	2002-06-11 22:49:40.000000000 +0000
@@ -10,6 +10,7 @@ fi
 
 pwd=`pwd`
 tmp=part-sl.$$
+tmp_symlink=part-sym.$$
 trap 'status=$?; cd $pwd; exec 1>&2; rm -rf $tmp $other_partition_tmpdir && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
@@ -25,6 +26,8 @@ if test -z "$other_partition_tmpdir"; th
 fi
 
 framework_failure=0
+ln -s anyfile $tmp_symlink || framework_failure=1
+rm -f $tmp_symlink
 mkdir $tmp || framework_failure=1
 cd $tmp || framework_failure=1
 
@@ -85,27 +88,27 @@ for copy in cp mv; do
       (
 	(
 	  # echo 1>&2 cp $options $args
-	  $copy $options $actual_args 2>.err
+	  $copy $options $actual_args 2>_err
 	  copy_status=$?
 	  echo $copy_status $copy $options $args
 
 	  # Normalize the program name in the error output,
 	  # remove any site-dependent part of other-partition file name,
 	  # and put brackets around the output.
-	  test -s .err && {
+	  test -s _err && {
 	    echo '[' | tr -d '\012'
-	    sed 's/^[^:][^:]*\(..\):/\1:/;s,'$other_partition_tmpdir/,, .err
+	    sed 's/^[^:][^:]*\(..\):/\1:/;s,'$other_partition_tmpdir/,, _err
 	    echo ']' | tr -d '\012'
 	    }
 	  # Strip off all but the file names.
 	  # Remove any site-dependent part of each file name.
-	  ls="`ls -lG --ignore=.err . \
+	  ls="`ls -lG --ignore=_err . \
 	      | sed \
 		  -e '/^total /d' \
 		  -e s,$other_partition_tmpdir/,, \
 		  -e s,$pwd_tmp/,, \
 		  -e 's/^...............................................//'`"
-	  ls2="`cd $other_partition_tmpdir && ls -lG --ignore=.err . \
+	  ls2="`cd $other_partition_tmpdir && ls -lG --ignore=_err . \
 	      | sed \
 		  -e '/^total /d' \
 		  -e s,$other_partition_tmpdir/,, \
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/rm/Makefile.am	2001-02-18 19:29:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/rm/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -10,5 +10,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=rm
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/rm/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/rm/Makefile.in	2002-06-11 14:19:26.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,17 +104,16 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.1 gnits
 
 TESTS = r-1 r-2 r-3 i-1 ir-1 f-1 sunos-1 deep-1 hash \
@@ -131,36 +126,32 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=rm
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/rm
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/rm/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -174,6 +165,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -189,9 +181,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -211,6 +206,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -221,7 +222,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -247,23 +252,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -272,11 +274,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -284,7 +286,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -298,14 +300,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/rmdir/Makefile.am	2000-01-07 08:53:04.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/rmdir/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -7,5 +7,5 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=rmdir
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/rmdir/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/rmdir/Makefile.in	2002-06-11 14:19:26.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,17 +104,16 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.4 gnits
 
 TESTS = ignore
@@ -127,36 +122,32 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH \
+  PATH="`pwd`/../../src;$$PATH" \
   PROG=rmdir
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/rmdir
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/rmdir/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -170,6 +161,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -185,9 +177,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -207,6 +202,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -217,7 +218,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -243,23 +248,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -268,11 +270,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -280,7 +282,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -294,14 +296,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/setgid-check	2000-12-31 09:39:20.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/setgid-check	2002-06-11 13:41:50.000000000 +0000
@@ -5,6 +5,10 @@
 # This test should be run in the temporary directory that ends
 # up being removed via the trap commands.
 
+if [ "a$IGNORE_SETGID_CHECK" != "a" ]; then
+    exit
+fi
+
 cwd_is_setgid=no
 
 setgid_tmpdir=setgid-$$
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/shred/Makefile.am	2000-09-25 19:43:56.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/shred/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -6,6 +6,6 @@ TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
 TESTS = remove exact
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/shred/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/shred/Makefile.in	2002-06-11 14:19:26.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,54 +104,49 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 EXTRA_DIST = $(TESTS)
 
 TESTS_ENVIRONMENT = \
   top_srcdir=$(top_srcdir) \
   srcdir=$(srcdir) \
   PERL="@PERL@" \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
 
 TESTS = remove exact
-EXEEXT =
-OBJEXT = o
 subdir = tests/shred
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits  tests/shred/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	  $(AUTOMAKE) --gnu  tests/shred/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -169,6 +160,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -184,9 +176,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -206,6 +201,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -216,7 +217,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -242,23 +247,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -267,11 +269,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -279,7 +281,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -293,14 +295,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/touch/Makefile.am	2000-11-10 16:27:50.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/touch/Makefile.am	2002-06-11 13:41:52.000000000 +0000
@@ -5,4 +5,4 @@ TESTS = dir-1 dangling-symlink empty-fil
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   host_triplet=$(host_triplet) \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/touch/Makefile.in	2001-04-29 08:25:40.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/touch/Makefile.in	2002-06-11 14:19:26.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,19 +49,14 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 host_alias = @host_alias@
 host_triplet = @host@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CATALOGS = @CATALOGS@
@@ -71,6 +66,7 @@ CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+EXEEXT = @EXEEXT@
 FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -82,7 +78,6 @@ GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
@@ -93,14 +88,15 @@ LIBOBJS = @LIBOBJS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_CRYPT = @LIB_CRYPT@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
-MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
 PACKAGE = @PACKAGE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -108,52 +104,47 @@ POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 SEQ_LIBM = @SEQ_LIBM@
 SQRT_LIBM = @SQRT_LIBM@
-STRIP = @STRIP@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 YACC = @YACC@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 l = @l@
 
-
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = dir-1 dangling-symlink empty-file fifo no-rights obsolescent
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   host_triplet=$(host_triplet) \
-  PATH=`pwd`/../../src:$$PATH
+  PATH="`pwd`/../../src;$$PATH"
 
-EXEEXT =
-OBJEXT = o
 subdir = tests/touch
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 DIST_COMMON = Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits  tests/touch/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; fail_list=; xpass_list=; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -167,6 +158,7 @@ check-TESTS: $(TESTS)
 	      *" $$tst "*) \
 	        xpass=`expr $$xpass + 1`; \
 	        failed=`expr $$failed + 1`; \
+                xpass_list="$$xpass_list $$tst"; \
 	        echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
@@ -182,9 +174,12 @@ check-TESTS: $(TESTS)
 	      ;; \
 	      *) \
 	        failed=`expr $$failed + 1`; \
+                fail_list="$$fail_list $$tst"; \
 	        echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -204,6 +199,12 @@ check-TESTS: $(TESTS)
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
+	  if test "$$failed" -neq 0; then \
+            echo "Failed tests:$fail_list"; \
+	    if test "$$xpass" -neq 0; then \
+	      echo "Tests that passed unexpectedly:$xpass_list"; \
+            fi; \
+	  fi; \
 	  test "$$failed" -eq 0; \
 	fi
 
@@ -214,7 +215,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VE
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -240,23 +245,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -265,11 +267,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -277,7 +279,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -291,14 +293,15 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+uninstall-am: uninstall-info-am
+
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
 	distclean distclean-generic distdir dvi dvi-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am
-
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/touch/no-rights	2000-11-27 07:59:20.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/touch/no-rights	2002-06-12 00:55:52.000000000 +0000
@@ -10,8 +10,8 @@ fi
 DEFAULT_SLEEP_SECONDS=2
 SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS}
 
-t1=touch-no-rw1
-t2=touch-no-rw2
+t1=no-rw1
+t2=no-rw2
 rm -rf $t1 $t2
 : > $t1
 
--- /dev/c/develop/ports/orig/fileutils-4.1/config.h.in	2001-04-22 10:19:08.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/config.h-in	2002-06-11 14:48:04.000000000 +0000
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h-in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if you have the Andrew File System. */
 #undef AFS
@@ -284,6 +284,9 @@ else
 /* Define if you have the `fchdir' function. */
 #undef HAVE_FCHDIR
 
+/* Define if you have the `fchown' function. */
+#undef HAVE_FCHOWN
+
 /* Define if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -447,6 +450,9 @@ else
 /* Define if you support file names longer than 14 characters. */
 #undef HAVE_LONG_FILE_NAMES
 
+/* Define if you have the `lstat' function. */
+#undef HAVE_LSTAT
+
 /* Define if lstat has the bug that it succeeds when given the zero-length
    file name argument. The lstat from SunOS4.1.4 and the Hurd as of
    1998-11-01) do this. */
--- /dev/c/develop/ports/orig/fileutils-4.1/tests/mv/into-self	2000-10-21 20:42:32.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/tests/mv/to-self	2002-06-12 00:45:58.000000000 +0000
@@ -6,8 +6,8 @@ if test "$VERBOSE" = yes; then
   mv --version
 fi
 
-dir=into-self-dir
-file=into-self-file
+dir=toselfdir
+file=toselffile
 
 test_failure=0
 
--- /dev/null	2003-08-30 23:41:41.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/djstart.c	2003-08-30 23:40:06.000000000 +0000
@@ -0,0 +1,203 @@
+/* dj_startup -- Start-up code for GNU Fileutils under MS-DOS/DJGPP
+
+   Written by Eli Zaretskii <eliz@is.elta.co.il>
+
+   This code may be freely distributed, provided that this
+   copyright notice is left intact.  There is no warranty on
+   this code.
+
+   Commentary:
+   ----------
+
+   GNU Fileutils deal with files, and are notorious (as most other
+   Unix file-related utilities) for hardcoded assumptions about
+   filenames, especially regarding the slash character and the
+   insistance on knowing the fact that a filename that begins with
+   anything other than a slash is a relative filename (what about
+   DOS d:/file pathnames?).  To make these programs work on MSDOS,
+   it makes sense to convert all the filename arguments to the
+   forward-slash Unix-style notation at start-up.  This would
+   eliminate multiple #ifdef's in the programs' code.  The only
+   thing to take care of is to leave the options alone.
+
+   This module is supplied to do this kind of automagic, by using the
+   static constructor hooks provided in DJGPP v2.0 and above.  It
+   should be linked with every program from this package and will be
+   called automatically by the DJGPP start-up code (on crt1.c) just
+   before the `main' function is called.
+
+   There are a few other small services that this module does, while
+   at that:
+
+   * It sets the default file open mode to BINARY, which is
+     appropriate for file I/O in this package and removes another
+     reason for #ifdef's in the main code;
+
+   * It sets the flag bits for the `stat' and `fstat' functions so
+     as to avoid computing fields of `struct stat' that are expensive,
+     unless that program really needs these fields.
+
+   WARNING WARNING WARNING!!!
+
+   This code relies heavily on the assumption that it will be called
+   for a single command-line only once during the entire life of the
+   program!  Thus all the flag variables are static.
+
+   Also note that some of the code below relies on the program name
+   in argv[0] and will break if you rename the program executable file!
+
+   You HAVE been warned!
+
+   WARNING WARNING WARNING!!!
+*/
+
+/*
+ * Copied from Fileutils 3.16 DJGPP port for use in Fileutils 4.0.
+ * Some slight modifications were made for use in Fileutils 4.1
+ * by Richard Dawe <rich@phekda.freeserve.co.uk>.
+ */
+
+#include <config.h>
+
+#ifdef __DJGPP__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <io.h>
+#include <crt0.h>
+
+#if (__DJGPP__ >= 3) || ((__DJGPP__ == 2) && (__DJGPP_MINOR__ >= 4))
+#include <sys/xdevices.h>
+#endif
+
+int _crt0_startup_flags = _CRT0_FLAG_DROP_EXE_SUFFIX;
+
+#ifndef _POSIX_SOURCE
+/* Let's punish the user as little as we can by requesting
+   the fastest possible version of `stat' for each program.
+   Note that `ls' is not here because it sets the bits at
+   run time, given the options on its command line.  */
+#define  DEFAULT_STAT_BITS  (_STAT_WRITEBIT   | \
+			     _STAT_ROOT_TIME  | \
+			     _STAT_DIRSIZE    | \
+			     _STAT_EXEC_MAGIC | \
+			     _STAT_EXEC_EXT)
+
+static struct {
+  char *name;
+  unsigned short stat_bits;
+} prog_bits[] = {
+    {"chmod",   ~(_STAT_DIRSIZE | _STAT_EXEC_EXT | _STAT_EXEC_MAGIC)},
+    {"chown",   ~_STAT_DIRSIZE},
+    {"cp",      ~(_STAT_DIRSIZE | _STAT_EXEC_EXT)},
+    {"ln",      ~_STAT_EXEC_EXT},
+    {"mv",	~(_STAT_DIRSIZE | _STAT_EXEC_EXT)},
+    {"rm",	~(_STAT_DIRSIZE | _STAT_EXEC_EXT)},
+    {"touch",	~_STAT_ROOT_TIME}
+};
+#endif
+
+static void
+init_stat_bits (const char *prog_name)
+{
+#ifndef _POSIX_SOURCE
+  int i;
+
+  _djstat_flags = DEFAULT_STAT_BITS;
+
+  for (i = 0; i < sizeof (prog_bits) / sizeof (prog_bits[0]); i++)
+    if (strcasecmp (prog_name, prog_bits[i].name) == 0)
+      {
+	_djstat_flags &= prog_bits[i].stat_bits;
+	break;
+      }
+#endif
+}
+
+static void
+init_file_io (const char *prog_name)
+{
+  _fmode = O_BINARY;
+
+  /* Only `dd' needs to switch standard streams to binary.  */
+  if (strcasecmp (prog_name, "dd") == 0)
+    {
+      if (!isatty (fileno (stdin)))
+	setmode (fileno (stdin), O_BINARY);
+      if (!isatty (fileno (stdout)))
+	setmode (fileno (stdout), O_BINARY);
+    }
+}
+
+static int options_first;       /* options preceed non-options */
+static int no_more_options = 0; /* did we see all of the options yet? */
+
+extern int    __crt0_argc;	/* defined by the DJGPP startup code */
+extern char **__crt0_argv;
+
+static void __attribute__((constructor))
+djgpp_fileutils_startup (void)
+{
+  char *  argv0base, *dot;
+  char ** arg_walker = __crt0_argv;
+  int     arg_count  = __crt0_argc;
+
+  /* Convert all non-option ARGV[] elements to forward slashes.  */
+  if (!options_first)
+    options_first = getenv("POSIXLY_CORRECT") != (char *)0;
+
+  while (arg_count--)
+    {
+      char *p = *arg_walker++;
+
+      if (no_more_options == 0)
+	{
+	  if (p[0] == '-')
+	    {
+	      if (p[1] == '-' && p[2] == '\0')
+		no_more_options = 1;
+	      continue;
+	    }
+	  else if (options_first)
+	    no_more_options = 1;
+	}
+      while (*p)
+	{
+	  if (*p == '\\')
+	    *p = '/';
+	  p++;
+	}
+    }
+
+  /* Find out what's the name of the program.  */
+  argv0base = strrchr (*__crt0_argv, '/');
+  if (!argv0base)
+    argv0base = strrchr (*__crt0_argv, ':');
+  if (argv0base)
+    argv0base++;
+  else
+    argv0base = *__crt0_argv;
+
+  /* When we are called by another DJGPP program, the
+     _CRT0_FLAG_DROP_EXE_SUFFIX bit does not always work.  */
+  if ((dot = strchr (argv0base, '.')))
+    *dot = '\0';
+
+  /* Richard Dawe <rich@phekda.freeserve.co.uk>: Use argv0base as
+   * the actual program name. */
+  __crt0_argv[0] = argv0base;
+
+  init_stat_bits (argv0base);
+  init_file_io (argv0base);
+
+#if (__DJGPP__ >= 3) || ((__DJGPP__ == 2) && (__DJGPP_MINOR__ >= 4))
+  __install_dev_zero();
+  __install_dev_full();
+#endif
+}
+
+#endif /* __DJGPP__ */
--- /dev/null	2003-08-30 23:41:41.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/djutils.c	2003-08-30 23:40:06.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * djutils.c
+ * Miscellaneous utility functions for DJGPP port of Fileutils 4.0 and 4.1.
+ *
+ * Some parts written by Richard Dawe <rich@phekda.freeserve.co.uk>,
+ * some taken from the port of Fileutils 3.16
+ * by Eli Zaretskii <eliz@is.elta.co.il>.
+ */
+
+#include <config.h>
+
+#ifdef __DJGPP__
+
+/* Versions of DJGPP > 2.03 support symlinks (currently only DJGPP CVS). If
+ * symlinks are supported, we don't need this code. */
+#ifndef HAVE_LSTAT
+
+#include <sys/stat.h>
+
+/* DJGPP doesn't have `lstat', since MS-DOS doesn't
+ * support links.  Here's a trivial substitute that will do.  */
+int lstat (const char *fname, struct stat *st_buf)
+{
+  return stat (fname, st_buf);
+}
+
+#endif /* !HAVE_LSTAT */
+
+#ifndef HAVE_FCHOWN
+
+#include <sys/types.h>
+#include <errno.h>
+
+/* DJGPP doesn't have `fchown', so we pretend no-one has permission
+ * for this operation. */
+int fchown (int fd, uid_t uid, gid_t gid)
+{
+  errno = EPERM;
+  return -1;
+}
+
+#endif /* !HAVE_FCHOWN */
+
+#endif /* __DJGPP__ */
--- /dev/null	2003-08-30 23:41:41.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/filutil4.1-rel/src/ls-msdos.c	2003-08-30 23:40:06.000000000 +0000
@@ -0,0 +1,359 @@
+/*
+ * MSDOS-specific functions for `ls'.
+ *
+ * Written by Eli Zaretskii <eliz@is.elta.co.il>
+ *
+ * Copied from Fileutils 3.16 DJGPP port for use in the Fileutils 4.0
+ * and 4.1 DJGPP ports by Richard Dawe <rich@phekda.freeserve.co.uk>.
+ * Modifications are indicated by '(richdawe) ...' comments.
+ */
+
+#ifdef MSDOS
+
+#include <string.h>
+
+/*  dos_mode_string -- convert MS-DOS file attribute bits into a character
+    string.  The characters stored in STR are:
+
+    0   'r'  if file is read-only, '-' otherwise.
+    1   'h'  if file is hidden, '-' otherwise.
+    2   's'  if file has its system bit set, '-' otherwise.
+    3   'v'  if file is a volume label, '-' otherwise.
+    4   'd'  if file is a directory, '-' otherwise.
+    5   'm'  if file was modified since last backup, '-' otherwise.
+    
+    For instance, for a write-protected, hidden file the function
+    will return a string "rh----".  */
+
+void
+dos_mode_string (bits, str)
+    int bits;
+    char *str;
+{
+  unsigned mask = 1 << 5;
+  
+  strcpy(str, "rhsvdm");          /* assume all bits set */
+  for (str += 5; mask; mask >>= 1, --str)
+    if ((bits & mask) == 0)
+      *str = '-';                 /* put hyphen instead of unused bit */
+}
+
+#ifdef __DJGPP__
+
+/* What follows won't work with anything but DJGPP.  */
+
+#include <sys/stat.h>
+#include <dirent.h>
+
+static int colorization_required;
+
+/* Ls is a heavy user of `stat' whose full emulation on MS-DOS is
+   sometimes very expensive.  Let's punish the user as little as we
+   can by requesting the fastest possible version of `stat'.
+
+   The default bits, suitable for just displaying the names of the files
+   are defined on `djstart.c'; below are the bits required by various
+   Ls options. */
+void set_stat_bits_for_ls (int need_time, int need_size,
+			   int need_long_format, int msdos_long_format,
+			   int indicate_type, int use_color, int show_hidden)
+{
+#ifndef _POSIX_SOURCE
+  if (need_time)
+    _djstat_flags &= ~_STAT_ROOT_TIME;
+  if (need_size)
+    _djstat_flags &= ~_STAT_DIRSIZE;
+  if (need_long_format)
+    {
+      _djstat_flags &= ~(_STAT_ROOT_TIME
+			 | _STAT_DIRSIZE);
+      if (msdos_long_format)
+	_djstat_flags &= ~_STAT_EXEC_EXT;
+      else
+	_djstat_flags &= ~(_STAT_EXEC_MAGIC
+			   | _STAT_EXEC_EXT);
+    }
+  if (indicate_type)
+    _djstat_flags &= ~(_STAT_EXEC_EXT
+		       | _STAT_EXEC_MAGIC);
+  if (use_color)
+    _djstat_flags &= ~_STAT_EXEC_EXT;
+
+  /* (richdawe) Default to skipping hidden files. */
+  __opendir_flags &= ~__OPENDIR_FIND_HIDDEN;
+  __opendir_flags |= __OPENDIR_NO_HIDDEN;
+
+  /* Find hidden files only if user specified -a.  */
+  if (show_hidden)
+    {
+      /* (richdawe) Eli advised me that setting __OPENDIR_FIND_HIDDEN
+       * will not work, because of a bug in DJGPP 2.03's libc. We also need
+       * to clear __OPENDIR_NO_HIDDEN. */
+      __opendir_flags |= __OPENDIR_FIND_HIDDEN;
+      __opendir_flags &= ~__OPENDIR_NO_HIDDEN;
+
+      /* Find volume labels only if user specified both -a and -g.  */
+      if (msdos_long_format)
+	__opendir_flags |= __OPENDIR_FIND_LABEL;
+    }
+
+#endif /* _POSIX_SOURCE */
+
+  /* Our screen redirector (below) wants to know if
+     colorization was actually required.  */
+  if (use_color)
+    colorization_required = 1;
+  else
+    colorization_required = 0;
+}
+
+/*  Screen write redirector.  We need this to support colorization
+    without requiring ANSI.SYS driver (or its work-alike) to be loaded.
+
+    This function uses the DJGPP filesystem extensions mechanism.  It is
+    installed as a handler for handle-based functions (read/write/close)
+    for the standard output (but actually only handles writes, only if
+    the standard output is connected to the terminal, and only if user
+    asked for colorization).  When a buffer is written to the screen by
+    low-level functions of the DJGPP C library, our handler will be
+    called.  For any request that doesn't require colored screen writes
+    we return a zero to the caller, in which case the caller will handle
+    the output in the usual way (by eventually calling DOS).
+
+    When colorization *is* required, the buffer is written directly to
+    the screen while converting the ANSI escape sequences into calls to
+    DJGPP conio functions which change text attributes.  A non-zero value is
+    then returned to the caller to signal that the output has been handled.
+
+    Warning: this function relies on the fact that `ls' disables the use
+    of TAB characters when colorization is required, and therefore it
+    does NOT expand TABs!  It also doesn't check for NULL characters in
+    the buffer, and might end the output prematurely if there are NULLs.  */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <unistd.h>
+#include <conio.h>
+#include <sys/fsext.h>
+#include <go32.h>	/* for `_dos_ds' */
+#include <sys/farptr.h>
+
+static int norm_blink = -1, cur_blink = -1;
+static unsigned char norm_attr = 0, cur_attr = 0;
+static int isatty_stdout = -1;
+
+/* Restore the BIOS blinking bit to its original value.  Called at exit.  */
+static void
+restore_blink_bit (void)
+{
+  if (cur_blink != norm_blink)
+    {
+      if (norm_blink > 0)
+	blinkvideo ();
+      else
+	intensevideo ();
+    }
+}
+
+#define ESC '\033'
+
+static int
+msdos_screen_write (__FSEXT_Fnumber func, int *retval, va_list rest_args)
+{
+  static char *cbuf = NULL;
+  static size_t cbuf_len = 0;
+  /* Only dark colors mentioned here, so that bold has visible effect.  */
+  static enum COLORS screen_color[] = {BLACK, RED, GREEN, BROWN,
+				       BLUE, MAGENTA, CYAN, LIGHTGRAY};
+  char *anchor, *p_next;
+  unsigned char fg, bg;
+
+  int handle;
+  char *buf;
+  size_t buflen;
+
+  /* Avoid direct screen writes unless colorization was actually requested.
+     Otherwise, we will break programs that catch I/O from their children.  */
+  handle = va_arg (rest_args, int);
+  if (!colorization_required || func != __FSEXT_write
+      || !(handle == STDOUT_FILENO ? isatty_stdout : isatty (handle)))
+    return 0;
+
+  buf = va_arg (rest_args, char *);
+  if (!buf)
+    {
+      errno = EINVAL;
+      *retval = -1;
+      return 1;
+    }
+
+  /* Allocate a sufficiently large buffer to hold the output.  */
+  buflen = va_arg (rest_args, size_t);
+  if (!cbuf)
+    {
+      struct text_info txtinfo;
+
+      cbuf_len = buflen + 1;
+      cbuf = (char *)xmalloc (cbuf_len);
+      gettextinfo (&txtinfo);
+      norm_attr = txtinfo.attribute; /* save the original text attribute */
+      cur_attr = norm_attr;
+      /* Does it normally blink when bg has its 3rd bit set?  */
+      norm_blink = (_farpeekb (_dos_ds, 0x465) & 0x20) ? 1 : 0;
+      cur_blink = norm_blink;
+    }
+  else if (buflen >= cbuf_len)
+    {
+      cbuf_len = buflen + 1;
+      cbuf = (char *)xrealloc (cbuf, cbuf_len);
+    }
+  memcpy (cbuf, buf, buflen);
+  cbuf[buflen] = '\0';
+
+  /* Current text attributes are used as baseline.  */
+  fg = cur_attr & 15;
+  bg = (cur_attr >> 4) & 15;
+
+  /* Walk the buffer, writing text directly to video RAM,
+     changing color attributes when an escape sequence is seen.  */
+  for (anchor = p_next = cbuf;
+       (p_next = memchr (p_next, ESC, buflen - (p_next - cbuf))) != 0; )
+    {
+      char *p = p_next;
+
+      /* (richdawe) Handle the null escape sequence (ESC-[m), which ls uses
+       * to restore the original colour. */
+      if ((p[1] == '[') && (p[2] == 'm'))
+	{
+	  textattr (norm_attr);
+	  p += 3;
+	  anchor = p_next = p;
+	  continue;
+	}
+      
+      if (p[1] == '[')	/* "Esc-[" sequence */
+	{
+	  /* If some chars seen since the last escape sequence,
+	     write it out to the screen using current text attributes.  */
+	  if (p > anchor)
+	    {
+	      *p = '\0';	/* `cputs' needs ASCIIZ string */
+	      cputs (anchor);
+	      *p = ESC;		/* restore the ESC character */
+	      anchor = p;
+	    }
+	  p += 2;		/* get past "Esc-[" sequence */
+	  p_next = p;
+	  while (*p != 'm')	/* `m' ends the escape sequence */
+	    {
+	      char *q;
+	      long code = strtol (p, &q, 10);
+
+	      /* Sanity checks:
+
+		   q > p unless p doesn't point to a number;
+		   ANSI codes are between 0 and 47;
+		   Each ANSI code ends with a `;' or an `m'.
+
+		 If any of the above is violated, we just ignore the bogon. */
+	      if (q == p || code > 47 || code < 0 || (*q != 'm' && *q != ';'))
+		{
+		  p_next = q;
+		  break;
+		}
+	      if (*q == ';')	/* more codes to follow */
+		q++;
+
+	      /* Convert ANSI codes to color fore- and background.  */
+	      switch (code)
+		{
+		  case 0:	/* all attributes off */
+		    fg = norm_attr & 15;
+		    bg = (norm_attr >> 4) & 15;
+		    break;
+		  case 1:	/* intensity on */
+		    fg |= 8;
+		    break;
+		  case 4:	/* underline on */
+		    fg |= 8;	/* we can't, so make it bold instead */
+		    break;
+		  case 5:	/* blink */
+		    if (cur_blink != 1)
+		      {
+			blinkvideo (); /* ensure we are'nt in bright bg mode */
+			cur_blink = 1;
+		      }
+		    bg |= 8;
+		    break;
+		  case 7:	/* reverse video */
+		    {
+		      unsigned char t = fg;
+		      fg = bg;
+		      bg = t;
+
+		      /* If it was blinking before, let it blink after.  */
+		      if (fg & 8)
+			bg |= 8;
+
+		      /* If the fg was bold, let the background be bold.  */
+		      if ((t & 8) && cur_blink != 0)
+			{
+			  intensevideo ();
+			  cur_blink = 0;
+			}
+		    }
+		    break;
+		  case 8:	/* concealed on */ 
+		    fg = (bg & 7) | 8;	/* make fg be like bg, only bright */
+		    break;
+		  case 30: case 31: case 32: case 33: /* foreground color */
+		  case 34: case 35: case 36: case 37:
+		    fg = (fg & 8) | (screen_color[code - 30] & 15);
+		    break;
+		  case 40: case 41: case 42: case 43: /* background color */
+		  case 44: case 45: case 46: case 47:
+		    bg = (bg & 8) | (screen_color[code - 40] & 15);
+		    break;
+		  default:
+		    p_next = q;	/* ignore unknown codes */
+		    break;
+		}
+	      p = q;
+	    }
+	  if (*p == 'm' && p > p_next)
+	    {
+	      /* They don't *really* want it invisible, do they?  */
+	      if (fg == (bg & 7))
+		fg |= 8;	/* make it concealed instead */
+
+	      /* Construct the text attribute and set it.  */
+	      cur_attr = (bg << 4) | fg;
+	      textattr (cur_attr);
+	      p_next = anchor = p + 1;
+	    }
+	  else
+	    break;
+	}
+      else
+	p_next++;
+    }
+
+  /* Output what's left in the buffer.  */
+  cputs (anchor);
+  *retval = buflen;
+  return 1;
+}
+
+/* This is called before `main' to install our STDOUT redirector.  */
+
+static void __attribute__((constructor))
+djgpp_ls_startup (void)
+{
+  __FSEXT_set_function (STDOUT_FILENO, msdos_screen_write);
+  isatty_stdout = isatty (STDOUT_FILENO);
+  atexit (restore_blink_bit);
+}
+
+#endif  /* __DJGPP__ */
+#endif  /* MSDOS */
