.

1 files changed, 249 insertions, 22 deletions

diff --git a/configure b/configure
index e2521471b..6ce5f9369 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for GNU coreutils 6.1-cvs.
+# Generated by GNU Autoconf 2.60 for GNU coreutils 6.1.
 #
 # Report bugs to <bug-coreutils@gnu.org>.
 #
@@ -559,8 +559,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU coreutils'
 PACKAGE_TARNAME='coreutils'
-PACKAGE_VERSION='6.1-cvs'
-PACKAGE_STRING='GNU coreutils 6.1-cvs'
+PACKAGE_VERSION='6.1'
+PACKAGE_STRING='GNU coreutils 6.1'
 PACKAGE_BUGREPORT='bug-coreutils@gnu.org'
 
 ac_unique_file="src/ls.c"
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU coreutils 6.1-cvs to adapt to many kinds of systems.
+\`configure' configures GNU coreutils 6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1347,7 +1347,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU coreutils 6.1-cvs:";;
+     short | recursive ) echo "Configuration of GNU coreutils 6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1456,7 +1456,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU coreutils configure 6.1-cvs
+GNU coreutils configure 6.1
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1470,7 +1470,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU coreutils $as_me 6.1-cvs, which was
+It was created by GNU coreutils $as_me 6.1, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -2336,7 +2336,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='coreutils'
- VERSION='6.1-cvs'
+ VERSION='6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -30684,9 +30684,9 @@ esac
 
   if test $ac_cv_func_nanouptime != yes; then
     LIB_GETHRXTIME=
-    { echo "$as_me:$LINENO: checking whether CLOCK_MONOTONIC is defined" >&5
-echo $ECHO_N "checking whether CLOCK_MONOTONIC is defined... $ECHO_C" >&6; }
-if test "${gl_cv_have_CLOCK_MONOTONIC+set}" = set; then
+    { echo "$as_me:$LINENO: checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined" >&5
+echo $ECHO_N "checking whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined... $ECHO_C" >&6; }
+if test "${gl_cv_have_clock_gettime_macro+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -30697,23 +30697,23 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #        include <time.h>
-#        ifdef CLOCK_MONOTONIC
-	  have_CLOCK_MONOTONIC
+#        if defined CLOCK_MONOTONIC || defined CLOCK_REALTIME
+	  have_clock_gettime_macro
 #        endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "have_CLOCK_MONOTONIC" >/dev/null 2>&1; then
-  gl_cv_have_CLOCK_MONOTONIC=yes
+  $EGREP "have_clock_gettime_macro" >/dev/null 2>&1; then
+  gl_cv_have_clock_gettime_macro=yes
 else
-  gl_cv_have_CLOCK_MONOTONIC=no
+  gl_cv_have_clock_gettime_macro=no
 fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $gl_cv_have_CLOCK_MONOTONIC" >&5
-echo "${ECHO_T}$gl_cv_have_CLOCK_MONOTONIC" >&6; }
-    if test $gl_cv_have_CLOCK_MONOTONIC = yes; then
+{ echo "$as_me:$LINENO: result: $gl_cv_have_clock_gettime_macro" >&5
+echo "${ECHO_T}$gl_cv_have_clock_gettime_macro" >&6; }
+    if test $gl_cv_have_clock_gettime_macro = yes; then
       LIB_GETHRXTIME=$LIB_CLOCK_GETTIME
     fi
 
@@ -33827,6 +33827,8 @@ done
 
 
 
+
+
 # We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses
 # NGROUPS (as the array dimension for a struct member) without a definition.
 
@@ -34953,12 +34955,99 @@ fi
   { echo "$as_me:$LINENO: 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
+    { echo "$as_me:$LINENO: checking whether getmntinfo returns statvfs structures" >&5
+echo $ECHO_N "checking whether getmntinfo returns statvfs structures... $ECHO_C" >&6; }
+    if test "${fu_cv_sys_mounted_getmntinfo2+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#if HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
+#endif
+#if HAVE_SYS_STATVFS_H
+# include <sys/statvfs.h>
+#endif
+extern int getmntinfo (struct statfs **, int);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  fu_cv_sys_mounted_getmntinfo2=no
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	fu_cv_sys_mounted_getmntinfo2=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+    { echo "$as_me:$LINENO: result: $fu_cv_sys_mounted_getmntinfo2" >&5
+echo "${ECHO_T}$fu_cv_sys_mounted_getmntinfo2" >&6; }
+    if test $fu_cv_sys_mounted_getmntinfo2 = no; then
+      ac_list_mounted_fs=found
 
 cat >>confdefs.h <<\_ACEOF
 #define MOUNTED_GETMNTINFO 1
 _ACEOF
 
+    else
+      ac_list_mounted_fs=found
+
+cat >>confdefs.h <<\_ACEOF
+#define MOUNTED_GETMNTINFO2 1
+_ACEOF
+
+    fi
   fi
 fi
 
@@ -50279,6 +50368,144 @@ _ACEOF
 
 fi
 
+  { echo "$as_me:$LINENO: checking for struct statvfs.f_fstypename" >&5
+echo $ECHO_N "checking for struct statvfs.f_fstypename... $ECHO_C" >&6; }
+if test "${ac_cv_member_struct_statvfs_f_fstypename+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$statxfs_includes
+
+int
+main ()
+{
+static struct statvfs ac_aggr;
+if (ac_aggr.f_fstypename)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_statvfs_f_fstypename=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$statxfs_includes
+
+int
+main ()
+{
+static struct statvfs ac_aggr;
+if (sizeof ac_aggr.f_fstypename)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_statvfs_f_fstypename=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct_statvfs_f_fstypename=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_statvfs_f_fstypename" >&5
+echo "${ECHO_T}$ac_cv_member_struct_statvfs_f_fstypename" >&6; }
+if test $ac_cv_member_struct_statvfs_f_fstypename = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATVFS_F_FSTYPENAME 1
+_ACEOF
+
+
+fi
+
   { echo "$as_me:$LINENO: checking for struct statfs.f_type" >&5
 echo $ECHO_N "checking for struct statfs.f_type... $ECHO_C" >&6; }
 if test "${ac_cv_member_struct_statfs_f_type+set}" = set; then
@@ -62459,7 +62686,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU coreutils $as_me 6.1-cvs, which was
+This file was extended by GNU coreutils $as_me 6.1, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -62512,7 +62739,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU coreutils config.status 6.1-cvs
+GNU coreutils config.status 6.1
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"