*** empty log message ***

Remove explicit use of AC_HEADER_TIME.  It is required by
jm_CHECK_TYPE_STRUCT_TIMESPEC.  Using AC_HEADER_TIME and
`AC_REQUIRE'ing jm_CHECK_TYPE_STRUCT_TIMESPEC provoked a but
in autoconf whereby the expansion of the latter ended up preceding
the expansion of its prerequisite, AC_HEADER_TIME.
Reported by Volker Borchert.

THANKS

@@ -21,11 +21,13 @@ Bernhard Rosenkraenzer: bero@redhat.de
 Bjorn Helgaas: helgaas@rsn.hp.com
 Bob McCracken: kerouac@ravenet.com
 Bob Proulx: rwp@fc.hp.com
+Brian Kimball: bfk@footbag.org
 Brendan O'Dea: bod@compusol.com.au
 Charles Karney: karney@pppl.gov
 Chip Salzenberg: chip@valinux.com
 Chris Yeo: cyeo@biking.org
 Christian von Roques: roques@pond.sub.org
+Christian Krackowizer: kra1@technodat.co.at
 Colin Plumb: colin@nyx.net
 David Godfrey: dave@delta.demon.co.uk
 Dirk Lattermann: dlatt@t-online.de
@@ -33,6 +35,7 @@ Don Parsons: dparsons@synapse.kent.edu
 Eirik Fuller: eirik@netcom.com
 Eli Zaretskii: eliz@is.elta.co.il
 Emile LeBlanc: leblanc@math.toronto.edu
+Eric G. Miller: egm2@jps.net
 François Pinard: pinard@iro.umontreal.ca
 Galen Hazelwood: galenh@micron.net
 Germano Leichsenring: germano@jedi.cs.kobe-u.ac.jp

doc/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -98,6 +100,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

lib/ChangeLog

@@ -1,3 +1,25 @@
+2000-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.c (read_utmp): Guard with `#ifdef UTMP_NAME_FUNCTION',
+	rather than with `#if HAVE_UTMPNAME'.
+
+2000-02-01  Jim Meyering  <meyering@lucent.com>
+
+	* readutmp.h (UT_USER): Add parens.  From Andreas Schwab.
+
+2000-01-31  Jim Meyering  <meyering@lucent.com>
+
+	* nanosleep.h (nanosleep): Guard declaration with
+	`#if ! HAVE_DECL_NANOSLEEP'.
+	Without this, OFS gets a redeclaration error for gnu_nanosleep, due to
+	the declaration in that vendor's sys/timers.h.
+	Reported by Christian Krackowizer.
+
+	* quotearg.c (ISASCII): Add #undef and move definition to follow
+	inclusion of wctype.h to work around solaris2.6 namespace pollution.
+	(ISPRINT): Likewise.
+	Reported by Tom Tromey.
+
 2000-01-30  Jim Meyering  <meyering@lucent.com>
 
 	* readutmp.c (extract_trimmed_name): Use UT_USER instead of hard-coding

lib/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

lib/nanosleep.h

@@ -50,8 +50,10 @@ struct timespec
 };
 # endif
 
+# if ! HAVE_DECL_NANOSLEEP
 int
 nanosleep PARAMS ((const struct timespec *requested_delay,
 		   struct timespec *remaining_delay));
+# endif
 
 #endif

lib/quotearg.c

@@ -26,12 +26,6 @@
 #include <xalloc.h>
 
 #include <ctype.h>
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define ISASCII(c) 1
-#else
-# define ISASCII(c) isascii (c)
-#endif
-#define ISPRINT(c) (ISASCII (c) && isprint (c))
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -73,6 +67,17 @@
 
 #define INT_BITS (sizeof (int) * CHAR_BIT)
 
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
+# undef ISASCII
+# define ISASCII(c) 1
+#else
+# define ISASCII(c) isascii (c)
+#endif
+/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
+#undef ISPRINT
+#define ISPRINT(c) (ISASCII (c) && isprint (c))
+
 struct quoting_options
 {
   /* Basic quoting style.  */

lib/readutmp.c

@@ -57,7 +57,7 @@ extract_trimmed_name (const STRUCT_UTMP *ut)
    the number of entries, and return zero.  If there is any error,
    return non-zero and don't modify the parameters.  */
 
-#if HAVE_UTMPNAME
+#ifdef UTMP_NAME_FUNCTION
 
 int
 read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)

lib/readutmp.h

@@ -37,7 +37,9 @@
 #  define SET_UTMP_ENT setutxent
 #  define GET_UTMP_ENT getutxent
 #  define END_UTMP_ENT endutxent
-#  define UTMP_NAME_FUNCTION utmpxname
+#  ifdef HAVE_UTMPXNAME
+#   define UTMP_NAME_FUNCTION utmpxname
+#  endif
 # else
 #  include <utmp.h>
 #  define UTMP_STRUCT_NAME utmp
@@ -45,18 +47,20 @@
 #  define SET_UTMP_ENT setutent
 #  define GET_UTMP_ENT getutent
 #  define END_UTMP_ENT endutent
-#  define UTMP_NAME_FUNCTION utmpname
+#  ifdef HAVE_UTMPNAME
+#   define UTMP_NAME_FUNCTION utmpname
+#  endif
 # endif
 
 /* Accessor macro for the member named ut_user or ut_name.  */
 # ifdef HAVE_UTMPX_H
 
 #  if HAVE_STRUCT_UTMPX_UT_USER
-#   define UT_USER(Utmp) Utmp->ut_user
+#   define UT_USER(Utmp) ((Utmp)->ut_user)
 #  endif
 #  if HAVE_STRUCT_UTMPX_UT_NAME
 #   undef UT_USER
-#   define UT_USER(Utmp) Utmp->ut_name
+#   define UT_USER(Utmp) ((Utmp)->ut_name)
 #  endif
 
 # else

m4/ChangeLog

@@ -1,3 +1,29 @@
+2000-02-05  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: (jm_CHECK_ALL_TYPES): Require most macros.
+	Remove explicit use of AC_HEADER_TIME.  It is required by
+	jm_CHECK_TYPE_STRUCT_TIMESPEC.  Using AC_HEADER_TIME and
+	`AC_REQUIRE'ing jm_CHECK_TYPE_STRUCT_TIMESPEC provoked a but
+	in autoconf whereby the expansion of the latter ended up preceding
+	the expansion of its prerequisite, AC_HEADER_TIME.
+	Reported by Volker Borchert.
+
+2000-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* prereq.m4 (jm_PREREQ_READUTMP): Check for utmpxname.
+
+2000-02-02  Jim Meyering  <meyering@lucent.com>
+
+	* prereq.m4 (jm_PREREQ_ADDEXT): Fix typo that resulted in no
+	definition of HAVE_PATHCONF: s/AC_CHECK_FUNC/AC_CHECK_FUNCS/.
+	Reported by Eli Zaretskii.
+
+2000-01-31  Jim Meyering  <meyering@lucent.com>
+
+	* check-decl.m4 (jm_CHECK_DECLS): Add nanosleep to the list of
+	functions.  Add the time.h and sys/time.h headers along with the
+	AC_REQUIRE'ment of AC_HEADER_TIME.
+
 2000-01-30  Jim Meyering  <meyering@lucent.com>
 
 	* lib-check.m4: Clean up some kludgy old shadow password tests.

m4/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

m4/check-decl.m4

@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -6,6 +6,7 @@ dnl different packages.
 AC_DEFUN(jm_CHECK_DECLS,
 [
   AC_REQUIRE([_jm_DECL_HEADERS])
+  AC_REQUIRE([AC_HEADER_TIME])
   headers='
 #include <stdio.h>
 #if HAVE_STRING_H
@@ -24,6 +25,18 @@ AC_DEFUN(jm_CHECK_DECLS,
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#include <sys/types.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 '
 
   if test x = y; then
@@ -41,10 +54,11 @@ AC_DEFUN(jm_CHECK_DECLS,
     AC_DEFINE(HAVE_DECL_STRSTR, 1, [Define if this function is declared.])
     AC_DEFINE(HAVE_DECL_STRTOUL, 1, [Define if this function is declared.])
     AC_DEFINE(HAVE_DECL_STRTOULL, 1, [Define if this function is declared.])
+    AC_DEFINE(HAVE_DECL_NANOSLEEP, 1, [Define if this function is declared.])
   fi
 
   jm_CHECK_DECLARATIONS($headers, free lseek malloc \
-                        memchr realloc stpcpy strstr strtoul strtoull)
+                        memchr nanosleep realloc stpcpy strstr strtoul strtoull)
 ])
 
 dnl FIXME: when autoconf has support for it.
@@ -52,5 +66,5 @@ dnl This is a little helper so we can require these header checks.
 AC_DEFUN(_jm_DECL_HEADERS,
 [
   AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h)
+  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h sys/time.h)
 ])

m4/jm-macros.m4

@@ -1,4 +1,4 @@
-#serial 12
+#serial 13
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -190,32 +190,31 @@ AC_DEFUN(jm_MACROS,
 AC_DEFUN(jm_CHECK_ALL_TYPES,
 [
   dnl Checks for typedefs, structures, and compiler characteristics.
-  AC_C_BIGENDIAN
-  AC_PROG_CC_STDC
-  AC_C_CONST
-  AC_C_INLINE
-  AC_C_LONG_DOUBLE
+  AC_REQUIRE([AC_C_BIGENDIAN])
+  AC_REQUIRE([AC_PROG_CC_STDC])
+  AC_REQUIRE([AC_C_CONST])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([AC_C_LONG_DOUBLE])
 
-  AC_HEADER_DIRENT
-  AC_HEADER_STDC
+  AC_REQUIRE([AC_HEADER_DIRENT])
+  AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_MEMBERS((struct stat.st_blksize))
-  AC_STRUCT_ST_BLOCKS
+  AC_REQUIRE([AC_STRUCT_ST_BLOCKS])
 
-  AC_STRUCT_TM
-  AC_HEADER_TIME
-  AC_STRUCT_TIMEZONE
-  AC_HEADER_STAT
-  AC_STRUCT_ST_MTIM_NSEC
-  AC_STRUCT_ST_DM_MODE
+  AC_REQUIRE([AC_STRUCT_TM])
+  AC_REQUIRE([AC_STRUCT_TIMEZONE])
+  AC_REQUIRE([AC_HEADER_STAT])
+  AC_REQUIRE([AC_STRUCT_ST_MTIM_NSEC])
+  AC_REQUIRE([AC_STRUCT_ST_DM_MODE])
   AC_REQUIRE([jm_CHECK_TYPE_STRUCT_TIMESPEC])
 
-  AC_TYPE_GETGROUPS
-  AC_TYPE_MODE_T
-  AC_TYPE_OFF_T
-  AC_TYPE_PID_T
-  AC_TYPE_SIGNAL
-  AC_TYPE_SIZE_T
-  AC_TYPE_UID_T
+  AC_REQUIRE([AC_TYPE_GETGROUPS])
+  AC_REQUIRE([AC_TYPE_MODE_T])
+  AC_REQUIRE([AC_TYPE_OFF_T])
+  AC_REQUIRE([AC_TYPE_PID_T])
+  AC_REQUIRE([AC_TYPE_SIGNAL])
+  AC_REQUIRE([AC_TYPE_SIZE_T])
+  AC_REQUIRE([AC_TYPE_UID_T])
   AC_CHECK_TYPE(ino_t, unsigned long)
 
   dnl This relies on the fact that autoconf 2.14a's implementation of

m4/prereq.m4

@@ -17,7 +17,7 @@ AC_DEFUN(jm_PREREQ_ADDEXT,
 [
   dnl For addext.c.
   AC_SYS_LONG_FILE_NAMES
-  AC_CHECK_FUNC(pathconf)
+  AC_CHECK_FUNCS(pathconf)
   AC_CHECK_HEADERS(limits.h string.h unistd.h)
 ])
 
@@ -50,6 +50,7 @@ AC_DEFUN(jm_PREREQ_READUTMP,
   AC_HEADER_STDC
   AC_CHECK_HEADERS(string.h utmpx.h sys/param.h)
   AC_CHECK_FUNCS(utmpname)
+  AC_CHECK_FUNCS(utmpxname)
   AM_C_PROTOTYPES
 
   utmp_includes="\

man/chgrp.x

@@ -1,4 +1,4 @@
 [NAME]
 chgrp \- change group ownership
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/dircolors.x

@@ -1,4 +1,4 @@
 [NAME]
 dircolors \- color setup for ls
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/du.x

@@ -1,4 +1,4 @@
 [NAME]
 du \- estimate file space usage
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/ln.x

@@ -1,4 +1,4 @@
 [NAME]
 ln \- make links between files
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/ls.x

@@ -1,4 +1,4 @@
 [NAME]
 ls \- list directory contents
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/mkdir.x

@@ -1,4 +1,4 @@
 [NAME]
 mkdir \- make directories
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/mkfifo.x

@@ -1,4 +1,4 @@
 [NAME]
 mkfifo \- make FIFOs (named pipes)
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/mknod.x

@@ -1,4 +1,4 @@
 [NAME]
 mknod \- make block or character special files
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/mv.x

@@ -1,4 +1,4 @@
 [NAME]
 mv \- move (rename) files
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/rmdir.x

@@ -1,4 +1,4 @@
 [NAME]
 rmdir \- remove empty directories
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/shred.x

@@ -1,4 +1,4 @@
 [NAME]
 shred \- delete a file securely, first overwriting it to hide its contents
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/sync.x

@@ -1,4 +1,4 @@
 [NAME]
 sync \- flush filesystem buffers
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/touch.x

@@ -1,4 +1,4 @@
 [NAME]
 touch \- change file timestamps
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

man/vdir.x

@@ -1,4 +1,4 @@
 [NAME]
 vdir \- list directory contents
 [DESCRIPTION]
-." Add any additional description here
+.\" Add any additional description here

old/fileutils/ChangeLog

@@ -1,3 +1,35 @@
+2000-02-05  Jim Meyering  <meyering@lucent.com>
+
+	* src/copy.c (copy_internal): Don't allow mv to move a directory onto
+	a non-directory.  Reported by Brian Kimball via Michael Stone.
+
+2000-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* tests/mv/Makefile.am (TESTS): Add dir-file.
+	(TESTS_ENVIRONMENT): Remove vestiges of old tests.
+	* tests/mv/dir-file: New file.
+
+2000-02-02  Jim Meyering  <meyering@lucent.com>
+
+	* tests/touch/Makefile.am (TESTS): Add fifo.
+	* tests/touch/fifo (fail): New file.
+
+2000-02-01  Jim Meyering  <meyering@lucent.com>
+
+	* src/touch.c (O_NDELAY): Define to 0 if not defined.
+	(O_NONBLOCK): Define to O_NDELAY if not defined.
+	(touch): Open with O_NONBLOCK, so one can touch a fifo without hanging.
+	Reported by Eric G. Miller via Michael Stone.
+
+	* man/*.x: Change ." to .\".
+	Reported by Andreas Schwab and Brendan O'Dea.
+
+2000-01-31  Jim Meyering  <meyering@lucent.com>
+
+	* man/Makefile.maint (ginstall_filter): Define.
+	($(man_MANS)): Use it here so that the install.1 man page refers
+	to `install', not `ginstall'.  Reported by Andreas Schwab.
+
 2000-01-30  Jim Meyering  <meyering@lucent.com>
 
 	* Version 4.0p.

old/fileutils/NEWS

@@ -1,4 +1,8 @@
 Changes in release 4.1:
+[4.0q]
+* `mv DIR EXISTING-FILE' no longer removes EXISTING-FILE.  Now it gets an error
+  as POSIX says it must.
+* touch no longer hangs on fifos
 [4.0p]
 * various tools: quote multibyte characters correctly in diagnostics
 * mv: portability fix for alpha

old/sh-utils/ChangeLog

@@ -1,7 +1,20 @@
+2000-02-05  Jim Meyering  <meyering@lucent.com>
+
+	* Version 2.0f.
+
+	* src/who.c: Use UT_USER in place of hard-coded `->ut_name' here, too.
+	* src/pinky.c: Likewise.
+	Reported by Tom Tromey and Andreas Schwab.
+	* src/uptime.c (print_uptime): Likewise.
+	* src/users.c (list_entries_users): Likewise.
+
 2000-01-30  Jim Meyering  <meyering@lucent.com>
 
 	* Version 2.0e.
 
+	* src/su.c (correct_password): Guard with `HAVE_GETSPNAM &&
+	HAVE_STRUCT_PASSWD_SP_PWDP', rather than just `#ifdef HAVE_SHADOW_H'.
+
 	* po/POTFILES.in: Add lib/makepath.c, lib/obstack.c, lib/rpmatch.c,
 	and lib/same.c.
 

old/sh-utils/NEWS

@@ -1,4 +1,6 @@
 Changes in release 2.1
+ [2.0f]
+* fix build problems with ut_name vs. ut_user
  [2.0e]
 * stty: fix long-standing bug that caused test failures on at least HPUX
   systems when COLUMNS was set to zero

old/textutils/NEWS

@@ -1,4 +1,6 @@
 Changes in release 2.1
+[2.0e]
+* configure and portability changes in m4/ and lib/
 [2.0d]
 * preliminary sort performance improvements
 * tsort now works more like the traditional UNIX tsort.  Before it would

src/copy.c

@@ -507,11 +507,23 @@ copy_internal (const char *src_path, const char *dst_path,
 		return (move_mode ? 1 : 0);
 	    }
 
-	  /* In move_mode, DEST may not be an existing directory.  */
-	  if (move_mode && S_ISDIR (dst_sb.st_mode))
+	  if (move_mode)
 	    {
-	      error (0, 0, _("%s: cannot overwrite directory"), dst_path);
-	      return 1;
+	      /* In move_mode, DEST may not be an existing directory.  */
+	      if (S_ISDIR (dst_sb.st_mode))
+		{
+		  error (0, 0, _("%s: cannot overwrite directory"), dst_path);
+		  return 1;
+		}
+
+	      /* Don't allow user to move a directory onto a non-directory.  */
+	      if (S_ISDIR (src_sb.st_mode) && !S_ISDIR (dst_sb.st_mode))
+		{
+		  error (0, 0,
+		       _("cannot move directory onto non-directory: %s -> %s"),
+			 src_path, dst_path);
+		  return 1;
+		}
 	    }
 
 	  if (x->backup_type != none && !S_ISDIR (dst_sb.st_mode))

src/pinky.c

@@ -1,5 +1,5 @@
 /* GNU's pinky.
-   Copyright (C) 1992-1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-1997, 1999, 2000 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
@@ -199,15 +199,15 @@ print_entry (const STRUCT_UTMP *utmp_ent)
       last_change = 0;
     }
 
-  printf ("%-8.*s", (int) sizeof (utmp_ent->ut_name), utmp_ent->ut_name);
+  printf ("%-8.*s", (int) sizeof (UT_USER (utmp_ent)), UT_USER (utmp_ent));
 
   if (include_fullname)
     {
       struct passwd *pw;
-      char name[sizeof (utmp_ent->ut_name) + 1];
+      char name[sizeof (UT_USER (utmp_ent)) + 1];
 
-      strncpy (name, utmp_ent->ut_name, sizeof (utmp_ent->ut_name));
-      name[sizeof (utmp_ent->ut_name)] = '\0';
+      strncpy (name, UT_USER (utmp_ent), sizeof (UT_USER (utmp_ent)));
+      name[sizeof (UT_USER (utmp_ent))] = '\0';
       pw = getpwnam (name);
       if (pw == NULL)
 	printf (" %19s", "        ???");
@@ -405,7 +405,7 @@ scan_entries (int n, const STRUCT_UTMP *utmp_buf,
 
   while (n--)
     {
-      if (utmp_buf->ut_name[0]
+      if (UT_USER (utmp_buf)[0]
 #ifdef USER_PROCESS
 	  && utmp_buf->ut_type == USER_PROCESS
 #endif
@@ -416,8 +416,8 @@ scan_entries (int n, const STRUCT_UTMP *utmp_buf,
 	      int i;
 
 	      for (i = 0; i < argc_names; i++)
-		if (strncmp (utmp_buf->ut_name, argv_names[i],
-			     sizeof (utmp_buf->ut_name)) == 0)
+		if (strncmp (UT_USER (utmp_buf), argv_names[i],
+			     sizeof (UT_USER (utmp_buf))) == 0)
 		  {
 		    print_entry (utmp_buf);
 		    break;

src/su.c

@@ -1,5 +1,5 @@
 /* su for GNU.  Run a shell with substitute user and group IDs.
-   Copyright (C) 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-2000 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
@@ -275,7 +275,7 @@ static int
 correct_password (const struct passwd *pw)
 {
   char *unencrypted, *encrypted, *correct;
-#ifdef HAVE_SHADOW_H
+#if HAVE_GETSPNAM && HAVE_STRUCT_PASSWD_SP_PWDP
   /* Shadow passwd stuff for SVR3 and maybe other systems.  */
   struct spwd *sp = getspnam (pw->pw_name);
 

src/touch.c

@@ -1,5 +1,5 @@
 /* touch -- change modification and access times of files
-   Copyright (C) 87, 1989-1991, 1995-1999 Free Software Foundation, Inc.
+   Copyright (C) 87, 1989-1991, 1995-2000 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
@@ -44,6 +44,14 @@ time_t time ();
 #define CH_ATIME 1
 #define CH_MTIME 2
 
+#if !defined O_NDELAY
+# define O_NDELAY 0
+#endif
+
+#if !defined O_NONBLOCK
+# define O_NONBLOCK O_NDELAY
+#endif
+
 /* The name by which this program was run. */
 char *program_name;
 
@@ -123,7 +131,7 @@ touch (const char *file)
   if (! no_create)
     {
       /* Try to open FILE, creating it if necessary.  */
-      fd = open (file, O_WRONLY | O_CREAT,
+      fd = open (file, O_WRONLY | O_CREAT | O_NONBLOCK,
 		 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
       if (fd == -1)
 	open_errno = errno;

src/uptime.c

@@ -1,5 +1,5 @@
 /* GNU's uptime.
-   Copyright (C) 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-2000 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
@@ -79,7 +79,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
      ones, also in the process possibly gleaning boottime. */
   while (n--)
     {
-      if (this->ut_name[0]
+      if (UT_USER (this) [0]
 #ifdef USER_PROCESS
 	  && this->ut_type == USER_PROCESS
 #endif

src/users.c

@@ -1,5 +1,5 @@
 /* GNU's users.
-   Copyright (C) 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-2000 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
@@ -58,7 +58,7 @@ list_entries_users (int n, const STRUCT_UTMP *this)
   u = (char **) xmalloc (n * sizeof (u[0]));
   for (i = 0; i < n; i++)
     {
-      if (this->ut_name[0]
+      if (UT_USER (this) [0]
 #ifdef USER_PROCESS
 	  && this->ut_type == USER_PROCESS
 #endif

src/who.c

@@ -1,5 +1,5 @@
 /* GNU's who.
-   Copyright (C) 1992-1999 Free Software Foundation, Inc.
+   Copyright (C) 1992-2000 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
@@ -153,7 +153,7 @@ print_entry (const STRUCT_UTMP *utmp_ent)
       last_change = 0;
     }
 
-  printf ("%-8.*s", (int) sizeof (utmp_ent->ut_name), utmp_ent->ut_name);
+  printf ("%-8.*s", (int) sizeof (UT_USER (utmp_ent)), UT_USER (utmp_ent));
   if (include_mesg)
     printf ("  %c  ", mesg);
   printf (" %-8.*s", (int) sizeof (utmp_ent->ut_line), utmp_ent->ut_line);
@@ -219,7 +219,7 @@ list_entries_who (int n, const STRUCT_UTMP *utmp_buf)
   entries = 0;
   while (n--)
     {
-      if (utmp_buf->ut_name[0]
+      if (UT_USER (utmp_buf)[0]
 #ifdef USER_PROCESS
 	  && utmp_buf->ut_type == USER_PROCESS
 #endif
@@ -261,7 +261,7 @@ scan_entries (int n, const STRUCT_UTMP *utmp_buf)
 
   while (n--)
     {
-      if (utmp_buf->ut_name[0]
+      if (UT_USER (utmp_buf)[0]
 #ifdef USER_PROCESS
 	  && utmp_buf->ut_type == USER_PROCESS
 #endif
@@ -299,7 +299,7 @@ search_entries (int n, const STRUCT_UTMP *utmp_buf, const char *line)
 {
   while (n--)
     {
-      if (utmp_buf->ut_name[0]
+      if (UT_USER (utmp_buf)[0]
 #ifdef USER_PROCESS
 	  && utmp_buf->ut_type == USER_PROCESS
 #endif

tests/basename/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/chmod/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/cp/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/cut/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/date/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/dd/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/dircolors/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/factor/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/head/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/install/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/join/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/ln/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/ls-2/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/ls/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/md5sum/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/mkdir/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/mv/Makefile.am

@@ -2,18 +2,10 @@
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = mv-special-1 into-self into-self-2 into-self-3 backup-is-src \
-  i-1 hard-link-1 force partition-perm to-symlink
+  i-1 hard-link-1 force partition-perm to-symlink dir-file
 
 EXTRA_DIST = $(TESTS) setup
 TESTS_ENVIRONMENT = \
-  DF=../../src/df \
-  LN=../../src/ln \
-  LS=../../src/ls \
-  MKDIR=../../src/mkdir \
-  MKNOD=../../src/mknod \
-  MV=../../src/mv \
-  RM=../../src/rm \
-  TOUCH=../../src/touch \
   PERL="@PERL@" \
   PATH=`pwd`/../../src:$$PATH \
   PROG=mv

tests/mv/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
@@ -111,19 +114,11 @@ l = @l@
 AUTOMAKE_OPTIONS = 1.3 gnits
 
 TESTS = mv-special-1 into-self into-self-2 into-self-3 backup-is-src \
-  i-1 hard-link-1 force partition-perm to-symlink
+  i-1 hard-link-1 force partition-perm to-symlink dir-file
 
 
 EXTRA_DIST = $(TESTS) setup
 TESTS_ENVIRONMENT = \
-  DF=../../src/df \
-  LN=../../src/ln \
-  LS=../../src/ls \
-  MKDIR=../../src/mkdir \
-  MKNOD=../../src/mknod \
-  MV=../../src/mv \
-  RM=../../src/rm \
-  TOUCH=../../src/touch \
   PERL="@PERL@" \
   PATH=`pwd`/../../src:$$PATH \
   PROG=mv

tests/mv/dir-file

@@ -0,0 +1,30 @@
+#!/bin/sh
+# mv must fail when src and dest are mismatched directory/non-directory.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  mv --version
+fi
+
+tmp=mv-mismatch-$$
+pwd=`pwd`
+trap "cd $pwd; rm -rf $tmp" 0 1 2 3 15
+
+framework_failure=0
+mkdir $tmp || framework_failure=1
+cd $tmp
+mkdir -p dir/file || framework_failure=1
+> file || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo 'failure in testing framework'
+  exit 1
+fi
+
+fail=0
+
+# These should both fail, but until fileutils-4.0q only the second one did.
+mv dir file > /dev/null 2>&1 && fail=1
+mv file dir > /dev/null 2>&1 && fail=1
+
+exit $fail

tests/mv/into-self-3

@@ -1,9 +1,6 @@
 #!/bin/sh
 # move a directory into itself, with a twist
 
-: ${MV=mv}
-: ${RM=rm}
-
 if test "$VERBOSE" = yes; then
   set -x
   mv --version

tests/pr/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/rm/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/rmdir/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/seq/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/shred/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/sort/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/stty/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/tac/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/tail-2/.cvsignore

@@ -0,0 +1 @@
+Makefile

tests/tail-2/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/tail/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/test/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/touch/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-.
 AUTOMAKE_OPTIONS = 1.3 gnits
 
-TESTS = empty-file dir-1 dangling-symlink no-rights
+TESTS = dir-1 dangling-symlink empty-file fifo no-rights
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PATH=`pwd`/../../src:$$PATH

tests/touch/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
@@ -110,7 +113,7 @@ l = @l@
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 
-TESTS = empty-file dir-1 dangling-symlink no-rights
+TESTS = dir-1 dangling-symlink empty-file fifo no-rights
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
   PATH=`pwd`/../../src:$$PATH

tests/touch/empty-file

@@ -34,6 +34,7 @@ if test $framework_failure = 1; then
   exit 1
 fi
 
+echo sleeping for $SLEEP_SECONDS seconds...
 sleep $SLEEP_SECONDS
 for d in $TOUCH_DIR_LIST; do
   touch $d/a || fail=1
@@ -41,6 +42,7 @@ for d in $TOUCH_DIR_LIST; do
   test "$*" = "x $d/a $d/b" || fail=1
 done
 
+echo sleeping for $SLEEP_SECONDS seconds...
 sleep $SLEEP_SECONDS
 for d in $TOUCH_DIR_LIST; do
   touch $d/b

tests/touch/fifo

@@ -0,0 +1,25 @@
+#!/bin/sh
+# Make sure touch works on fifos without hanging.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  touch --version
+fi
+
+framework_failure=0
+
+tmp=fifo-$$
+rm -rf $tmp
+mkfifo $tmp || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo 'failure in testing framework'
+  exit 1
+fi
+
+fail=0
+
+touch $tmp || fail=1
+rm -rf $tmp
+
+exit $fail

tests/touch/no-rights

@@ -16,6 +16,7 @@ rm -rf $t1 $t2
 : > $t1
 
 # Make sure $t2 is two seconds newer than $t1.
+echo sleeping for $SLEEP_SECONDS seconds...
 sleep $SLEEP_SECONDS
 : > $t2
 fail=0

tests/tr/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/tsort/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/unexpand/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/uniq/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@

tests/wc/Makefile.in

@@ -71,6 +71,7 @@ CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
+FESETROUND_LIBM = @FESETROUND_LIBM@
 GENCAT = @GENCAT@
 GETCONF = @GETCONF@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -86,6 +87,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 KMEM_GROUP = @KMEM_GROUP@
 LIBOBJS = @LIBOBJS@
+LIB_CRYPT = @LIB_CRYPT@
 MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -99,6 +101,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+SQRT_LIBM = @SQRT_LIBM@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@