From ff57f59217da2db9cddd918533c1f396c1622120 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 30 May 2005 07:41:32 +0000
Subject: Regenerate.

---
 Makefile.in                 |  22 ++---
 aclocal.m4                  |   1 +
 doc/Makefile.in             |  22 ++---
 lib/Makefile.in             |  42 ++++-----
 man/Makefile.in             |  22 ++---
 src/Makefile.in             |  24 +++---
 tests/Makefile.in           |  22 ++---
 tests/basename/Makefile.in  |  22 ++---
 tests/chgrp/Makefile.in     |  22 ++---
 tests/chmod/Makefile.in     |  22 ++---
 tests/chown/Makefile.in     |  22 ++---
 tests/cp/Makefile.in        |  22 ++---
 tests/cut/Makefile.in       |  22 ++---
 tests/date/Makefile.in      |  22 ++---
 tests/dd/Makefile.in        |  22 ++---
 tests/dircolors/Makefile.in |  22 ++---
 tests/du/Makefile.in        |  22 ++---
 tests/expr/Makefile.in      |  22 ++---
 tests/factor/Makefile.in    |  22 ++---
 tests/fmt/Makefile.in       |  22 ++---
 tests/head/Makefile.in      |  22 ++---
 tests/install/Makefile.in   |  22 ++---
 tests/join/Makefile.in      |  22 ++---
 tests/ln/Makefile.in        |  22 ++---
 tests/ls-2/Makefile.in      |  22 ++---
 tests/ls/Makefile.in        |  22 ++---
 tests/md5sum/Makefile.in    |  22 ++---
 tests/misc/Makefile.in      |  22 ++---
 tests/mkdir/Makefile.in     |  22 ++---
 tests/mv/Makefile.in        |  22 ++---
 tests/od/Makefile.in        |  22 ++---
 tests/pr/Makefile.in        |  22 ++---
 tests/readlink/Makefile.in  |  22 ++---
 tests/rm/Makefile.in        |  22 ++---
 tests/rmdir/Makefile.in     |  22 ++---
 tests/seq/Makefile.in       |  22 ++---
 tests/sha1sum/Makefile.in   |  22 ++---
 tests/shred/Makefile.in     |  22 ++---
 tests/sort/Makefile.in      |  22 ++---
 tests/stty/Makefile.in      |  22 ++---
 tests/sum/Makefile.in       |  22 ++---
 tests/tac/Makefile.in       |  22 ++---
 tests/tail-2/Makefile.in    |  22 ++---
 tests/tail/Makefile.in      |  22 ++---
 tests/tee/Makefile.in       |  22 ++---
 tests/test/Makefile.am      | 184 ++++++++++++++++++++-------------------
 tests/test/Makefile.in      | 206 +++++++++++++++++++++++---------------------
 tests/touch/Makefile.in     |  22 ++---
 tests/tr/Makefile.in        |  22 ++---
 tests/tsort/Makefile.in     |  22 ++---
 tests/unexpand/Makefile.in  |  22 ++---
 tests/uniq/Makefile.in      |  22 ++---
 tests/wc/Makefile.in        |  22 ++---
 53 files changed, 764 insertions(+), 749 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a48de4426..c7fdbcd72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,17 +129,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/aclocal.m4 b/aclocal.m4
index 3df3833a5..74accd6eb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1035,6 +1035,7 @@ m4_include([m4/strftime.m4])
 m4_include([m4/stripslash.m4])
 m4_include([m4/strndup.m4])
 m4_include([m4/strnlen.m4])
+m4_include([m4/strnumcmp.m4])
 m4_include([m4/strpbrk.m4])
 m4_include([m4/strstr.m4])
 m4_include([m4/strtod.m4])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 04ce814d8..4f2c0ba2d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4ef85d0ed..18d45039f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -78,15 +78,15 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	save-cwd.h savedir.c savedir.h setenv.c setenv.h settime.c \
 	sha1.c sha1.h sig2str.c sig2str.h stat-macros.h stdio-safer.h \
 	stpcpy.c strcasecmp.c strcspn.c strdup.c strdup.h strftime.c \
-	strftime.h stripslash.c strncasecmp.c strndup.c strndup.h \
-	strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c strtol.c \
-	strtoll.c strtoul.c strtoull.c strtoumax.c strverscmp.c \
-	strverscmp.h tempname.c timespec.h umaxtostr.c unistd-safer.h \
-	unlinkdir.c unlinkdir.h unlocked-io.h unsetenv.c userspec.c \
-	userspec.h utime.c utimecmp.c utimecmp.h utimens.c utimens.h \
-	vasnprintf.c vasprintf.c xalloc.h xmalloc.c xnanosleep.c \
-	xnanosleep.h xstrtol.c xstrtol.h xstrtoul.c xtime.h yesno.c \
-	yesno.h
+	strftime.h strintcmp.c stripslash.c strncasecmp.c strndup.c \
+	strndup.h strnlen.c strnumcmp-in.h strnumcmp.c strnumcmp.h \
+	strpbrk.c strstr.c strtod.c strtoimax.c strtol.c strtoll.c \
+	strtoul.c strtoull.c strtoumax.c strverscmp.c strverscmp.h \
+	tempname.c timespec.h umaxtostr.c unistd-safer.h unlinkdir.c \
+	unlinkdir.h unlocked-io.h unsetenv.c userspec.c userspec.h \
+	utime.c utimecmp.c utimecmp.h utimens.c utimens.h vasnprintf.c \
+	vasprintf.c xalloc.h xmalloc.c xnanosleep.c xnanosleep.h \
+	xstrtol.c xstrtol.h xstrtoul.c xtime.h yesno.c yesno.h
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \
@@ -172,17 +172,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
@@ -564,10 +564,12 @@ distclean-compile:
 @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)/strintcmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stripslash.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)/strnumcmp.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@
diff --git a/man/Makefile.in b/man/Makefile.in
index ef304b628..43c9b925d 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/src/Makefile.in b/src/Makefile.in
index fa3921748..536e9c11b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -152,17 +152,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
@@ -947,7 +947,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index cd9972600..040f5c588 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in
index 4d7171a47..62f8bf22a 100644
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in
index d9782b4b4..a69e8db94 100644
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index 0d94755a5..de2e4af84 100644
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in
index d10d02e65..f04a3f5ce 100644
--- a/tests/chown/Makefile.in
+++ b/tests/chown/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index d86dc803d..fc6231620 100644
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 9cceeeb9e..76440ea95 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index 07ba758b2..e0ee82a74 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index 5b3bea651..d43aa8e35 100644
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index a50a536ca..f28a3b8de 100644
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in
index 9f365dfdd..3c3a2c1c7 100644
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/expr/Makefile.in b/tests/expr/Makefile.in
index 83701bb57..458ff00ef 100644
--- a/tests/expr/Makefile.in
+++ b/tests/expr/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index 15755fe20..fec3e4bc2 100644
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in
index afe39b9e3..8149af68c 100644
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index e1f03c736..9dad9b718 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index bb4754902..02ff72bfe 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index e4fb1452a..df0e34605 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index fe3a191bc..6e931a420 100644
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index 9301ce0e7..8d5c663ae 100644
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 3a230a2d4..0a9a4780f 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 50bbc0ded..bdfbf96e1 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 0f6aaa32a..ac99e1ece 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index cfc471dc9..994410255 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index d772606fd..e0b44afca 100644
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in
index 9d062b266..ccce1ecd9 100644
--- a/tests/od/Makefile.in
+++ b/tests/od/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 0f4658dd0..e1f8eed2d 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/readlink/Makefile.in b/tests/readlink/Makefile.in
index d8da6b3cc..6763da716 100644
--- a/tests/readlink/Makefile.in
+++ b/tests/readlink/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 98f38b96a..ae3d7cd50 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in
index 0d71d4c24..09793bd2f 100644
--- a/tests/rmdir/Makefile.in
+++ b/tests/rmdir/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in
index 5b5832453..ce7e979a7 100644
--- a/tests/seq/Makefile.in
+++ b/tests/seq/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in
index a643ee4a6..8d81a159c 100644
--- a/tests/sha1sum/Makefile.in
+++ b/tests/sha1sum/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in
index b0d698aa1..01c9c111d 100644
--- a/tests/shred/Makefile.in
+++ b/tests/shred/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 0a8cab79f..0cfc9a7b7 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in
index 56131481f..5b5361ac6 100644
--- a/tests/stty/Makefile.in
+++ b/tests/stty/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index b2c40e6a3..3aa3e8c20 100644
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index e508e7c5b..199962408 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index d41a64bb1..4fa8892a6 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index cebc8ff4b..ad50c299a 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/tee/Makefile.in b/tests/tee/Makefile.in
index b9784c118..945843841 100644
--- a/tests/tee/Makefile.in
+++ b/tests/tee/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am
index 1ffe2673e..8748a318f 100644
--- a/tests/test/Makefile.am
+++ b/tests/test/Makefile.am
@@ -3,98 +3,104 @@
 ##test-files-begin
 x = test
 explicit =
-maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X le-1.X le-2.X le-3.X le-4.X \
-ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X P-1b.X NP-1b.X NNP-1b.X N-1c.X P-1c.X \
-NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X P-1e.X NP-1e.X \
-NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X NNP-1g.X N-1h.X \
-P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X P-1j.X NP-1j.X \
-NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X P-streq-1.X NP-streq-1.X \
-NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X NNP-streq-2.X N-streq-3.X \
-P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X P-streq-4.X NP-streq-4.X \
-NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X NNP-streq-5.X N-streq-6.X \
-N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X N-strne-2.X P-strne-2.X \
-NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X NP-strne-3.X NNP-strne-3.X \
-N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X N-strne-5.X P-strne-5.X \
-NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X P-and-1.X NP-and-1.X \
-NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X N-and-3.X P-and-3.X \
-NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X NNP-and-4.X N-or-1.X \
-P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X NP-or-2.X NNP-or-2.X N-or-3.X \
-P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X NP-or-4.X NNP-or-4.X N-eq-1.X \
-P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X NP-eq-2.X NNP-eq-2.X N-eq-3.X \
-P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X NP-eq-4.X NNP-eq-4.X N-eq-5.X \
-P-eq-5.X NP-eq-5.X NNP-eq-5.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X \
-P-gt-2.X NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X \
-P-gt-4.X NP-gt-4.X NNP-gt-4.X N-lt-1.X P-lt-1.X NP-lt-1.X NNP-lt-1.X N-lt-2.X \
-P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X NP-lt-3.X NNP-lt-3.X N-lt-4.X \
-P-lt-4.X NP-lt-4.X NNP-lt-4.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X \
-NP-t2.X NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X \
-1a.X 1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
+maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X ne-6.X le-1.X le-2.X le-3.X \
+le-4.X le-5.X ge-1.X ge-2.X ge-3.X ge-4.X ge-5.X N-1b.X P-1b.X NP-1b.X \
+NNP-1b.X N-1c.X P-1c.X NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X \
+P-1e.X NP-1e.X NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X \
+NNP-1g.X N-1h.X P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X \
+P-1j.X NP-1j.X NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X \
+P-streq-1.X NP-streq-1.X NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X \
+NNP-streq-2.X N-streq-3.X P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X \
+P-streq-4.X NP-streq-4.X NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X \
+NNP-streq-5.X N-streq-6.X N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X \
+N-strne-2.X P-strne-2.X NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X \
+NP-strne-3.X NNP-strne-3.X N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X \
+N-strne-5.X P-strne-5.X NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X \
+P-and-1.X NP-and-1.X NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X \
+N-and-3.X P-and-3.X NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X \
+NNP-and-4.X N-or-1.X P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X \
+NP-or-2.X NNP-or-2.X N-or-3.X P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X \
+NP-or-4.X NNP-or-4.X N-eq-1.X P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X \
+NP-eq-2.X NNP-eq-2.X N-eq-3.X P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X \
+NP-eq-4.X NNP-eq-4.X N-eq-5.X P-eq-5.X NP-eq-5.X NNP-eq-5.X N-eq-6.X P-eq-6.X \
+NP-eq-6.X NNP-eq-6.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X P-gt-2.X \
+NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X P-gt-4.X \
+NP-gt-4.X NNP-gt-4.X N-gt-5.X P-gt-5.X NP-gt-5.X NNP-gt-5.X N-lt-1.X P-lt-1.X \
+NP-lt-1.X NNP-lt-1.X N-lt-2.X P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X \
+NP-lt-3.X NNP-lt-3.X N-lt-4.X P-lt-4.X NP-lt-4.X NNP-lt-4.X N-lt-5.X P-lt-5.X \
+NP-lt-5.X NNP-lt-5.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X NP-t2.X \
+NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X 1a.X \
+1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
 streq-3.X streq-4.X streq-5.X streq-6.X strne-1.X strne-2.X strne-3.X \
 strne-4.X strne-5.X strne-6.X and-1.X and-2.X and-3.X and-4.X or-1.X or-2.X \
-or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X \
-lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X t2.X paren-1.X paren-2.X paren-3.X \
-paren-4.X paren-5.X
+or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X eq-6.X gt-1.X gt-2.X gt-3.X \
+gt-4.X gt-5.X lt-1.X lt-2.X lt-3.X lt-4.X lt-5.X inv-1.X t1.X t2.X paren-1.X \
+paren-2.X paren-3.X paren-4.X paren-5.X
 run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O \
-ne-5.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E ge-1.O ge-1.E \
-ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O \
-NP-1b.E NNP-1b.O NNP-1b.E N-1c.O N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E \
-NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O P-1d.E NP-1d.O NP-1d.E NNP-1d.O \
-NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O NP-1e.E NNP-1e.O NNP-1e.E N-1f.O \
-N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O \
-P-1g.E NP-1g.O NP-1g.E NNP-1g.O NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O \
-NP-1h.E NNP-1h.O NNP-1h.E N-1i.O N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E \
-NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O P-1j.E NP-1j.O NP-1j.E NNP-1j.O \
-NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O NP-1k.E NNP-1k.O NNP-1k.E \
-N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E NP-streq-1.O NP-streq-1.E \
-NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E P-streq-2.O P-streq-2.E \
-NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E N-streq-3.O N-streq-3.E \
-P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E NNP-streq-3.O NNP-streq-3.E \
-N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E NP-streq-4.O NP-streq-4.E \
-NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E P-streq-5.O P-streq-5.E \
-NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E N-streq-6.O N-streq-6.E \
-N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E NP-strne-1.O NP-strne-1.E \
-NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E P-strne-2.O P-strne-2.E \
-NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E N-strne-3.O N-strne-3.E \
-P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E NNP-strne-3.O NNP-strne-3.E \
-N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E NP-strne-4.O NP-strne-4.E \
-NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E P-strne-5.O P-strne-5.E \
-NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E N-strne-6.O N-strne-6.E \
-N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O NP-and-1.E NNP-and-1.O \
-NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E NP-and-2.O NP-and-2.E \
-NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O P-and-3.E NP-and-3.O \
-NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E P-and-4.O P-and-4.E \
-NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O N-or-1.E P-or-1.O \
-P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O N-or-2.E P-or-2.O \
-P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O N-or-3.E P-or-3.O \
-P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O N-or-4.E P-or-4.O \
-P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O N-eq-1.E P-eq-1.O \
-P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O N-eq-2.E P-eq-2.O \
-P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O N-eq-3.E P-eq-3.O \
-P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O N-eq-4.E P-eq-4.O \
-P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O N-eq-5.E P-eq-5.O \
-P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-gt-1.O N-gt-1.E P-gt-1.O \
-P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O N-gt-2.E P-gt-2.O \
-P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O N-gt-3.E P-gt-3.O \
-P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O N-gt-4.E P-gt-4.O \
-P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-lt-1.O N-lt-1.E P-lt-1.O \
-P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O N-lt-2.E P-lt-2.O \
-P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O N-lt-3.E P-lt-3.O \
-P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O N-lt-4.E P-lt-4.O \
-P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-t1.O N-t1.E P-t1.O \
-P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O P-t2.E NP-t2.O \
-NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O N-paren-2.E \
-N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O N-paren-5.E 1a.O \
-1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O 1g.E 1h.O 1h.E \
-1i.O 1i.E 1j.O 1j.E 1k.O 1k.E streq-1.O streq-1.E streq-2.O streq-2.E \
-streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E streq-6.O \
-streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O strne-3.E \
-strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O and-1.E \
-and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E \
-or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O \
-eq-4.E eq-5.O eq-5.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E \
-lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O \
-t1.E t2.O t2.E paren-1.O paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E \
-paren-4.O paren-4.E paren-5.O paren-5.E
+ne-5.E ne-6.O ne-6.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E \
+le-5.O le-5.E ge-1.O ge-1.E ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E ge-5.O \
+ge-5.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O NP-1b.E NNP-1b.O NNP-1b.E N-1c.O \
+N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O \
+P-1d.E NP-1d.O NP-1d.E NNP-1d.O NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O \
+NP-1e.E NNP-1e.O NNP-1e.E N-1f.O N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E \
+NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O P-1g.E NP-1g.O NP-1g.E NNP-1g.O \
+NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O NP-1h.E NNP-1h.O NNP-1h.E N-1i.O \
+N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O \
+P-1j.E NP-1j.O NP-1j.E NNP-1j.O NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O \
+NP-1k.E NNP-1k.O NNP-1k.E N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E \
+NP-streq-1.O NP-streq-1.E NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E \
+P-streq-2.O P-streq-2.E NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E \
+N-streq-3.O N-streq-3.E P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E \
+NNP-streq-3.O NNP-streq-3.E N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E \
+NP-streq-4.O NP-streq-4.E NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E \
+P-streq-5.O P-streq-5.E NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E \
+N-streq-6.O N-streq-6.E N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E \
+NP-strne-1.O NP-strne-1.E NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E \
+P-strne-2.O P-strne-2.E NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E \
+N-strne-3.O N-strne-3.E P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E \
+NNP-strne-3.O NNP-strne-3.E N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E \
+NP-strne-4.O NP-strne-4.E NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E \
+P-strne-5.O P-strne-5.E NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E \
+N-strne-6.O N-strne-6.E N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O \
+NP-and-1.E NNP-and-1.O NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E \
+NP-and-2.O NP-and-2.E NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O \
+P-and-3.E NP-and-3.O NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E \
+P-and-4.O P-and-4.E NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O \
+N-or-1.E P-or-1.O P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O \
+N-or-2.E P-or-2.O P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O \
+N-or-3.E P-or-3.O P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O \
+N-or-4.E P-or-4.O P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O \
+N-eq-1.E P-eq-1.O P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O \
+N-eq-2.E P-eq-2.O P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O \
+N-eq-3.E P-eq-3.O P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O \
+N-eq-4.E P-eq-4.O P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O \
+N-eq-5.E P-eq-5.O P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-eq-6.O \
+N-eq-6.E P-eq-6.O P-eq-6.E NP-eq-6.O NP-eq-6.E NNP-eq-6.O NNP-eq-6.E N-gt-1.O \
+N-gt-1.E P-gt-1.O P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O \
+N-gt-2.E P-gt-2.O P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O \
+N-gt-3.E P-gt-3.O P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O \
+N-gt-4.E P-gt-4.O P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-gt-5.O \
+N-gt-5.E P-gt-5.O P-gt-5.E NP-gt-5.O NP-gt-5.E NNP-gt-5.O NNP-gt-5.E N-lt-1.O \
+N-lt-1.E P-lt-1.O P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O \
+N-lt-2.E P-lt-2.O P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O \
+N-lt-3.E P-lt-3.O P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O \
+N-lt-4.E P-lt-4.O P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-lt-5.O \
+N-lt-5.E P-lt-5.O P-lt-5.E NP-lt-5.O NP-lt-5.E NNP-lt-5.O NNP-lt-5.E N-t1.O \
+N-t1.E P-t1.O P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O \
+P-t2.E NP-t2.O NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O \
+N-paren-2.E N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O \
+N-paren-5.E 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \
+1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E streq-1.O streq-1.E streq-2.O \
+streq-2.E streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E \
+streq-6.O streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O \
+strne-3.E strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O \
+and-1.E and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O \
+or-2.E or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E \
+eq-4.O eq-4.E eq-5.O eq-5.E eq-6.O eq-6.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O \
+gt-3.E gt-4.O gt-4.E gt-5.O gt-5.E lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E \
+lt-4.O lt-4.E lt-5.O lt-5.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E paren-1.O \
+paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E paren-4.O paren-4.E \
+paren-5.O paren-5.E
 ##test-files-end
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index 44a9b4958..b1d975ab9 100644
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
@@ -282,99 +282,105 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x = test
 explicit = 
-maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X le-1.X le-2.X le-3.X le-4.X \
-ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X P-1b.X NP-1b.X NNP-1b.X N-1c.X P-1c.X \
-NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X P-1e.X NP-1e.X \
-NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X NNP-1g.X N-1h.X \
-P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X P-1j.X NP-1j.X \
-NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X P-streq-1.X NP-streq-1.X \
-NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X NNP-streq-2.X N-streq-3.X \
-P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X P-streq-4.X NP-streq-4.X \
-NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X NNP-streq-5.X N-streq-6.X \
-N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X N-strne-2.X P-strne-2.X \
-NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X NP-strne-3.X NNP-strne-3.X \
-N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X N-strne-5.X P-strne-5.X \
-NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X P-and-1.X NP-and-1.X \
-NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X N-and-3.X P-and-3.X \
-NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X NNP-and-4.X N-or-1.X \
-P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X NP-or-2.X NNP-or-2.X N-or-3.X \
-P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X NP-or-4.X NNP-or-4.X N-eq-1.X \
-P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X NP-eq-2.X NNP-eq-2.X N-eq-3.X \
-P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X NP-eq-4.X NNP-eq-4.X N-eq-5.X \
-P-eq-5.X NP-eq-5.X NNP-eq-5.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X \
-P-gt-2.X NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X \
-P-gt-4.X NP-gt-4.X NNP-gt-4.X N-lt-1.X P-lt-1.X NP-lt-1.X NNP-lt-1.X N-lt-2.X \
-P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X NP-lt-3.X NNP-lt-3.X N-lt-4.X \
-P-lt-4.X NP-lt-4.X NNP-lt-4.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X \
-NP-t2.X NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X \
-1a.X 1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
+maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X ne-6.X le-1.X le-2.X le-3.X \
+le-4.X le-5.X ge-1.X ge-2.X ge-3.X ge-4.X ge-5.X N-1b.X P-1b.X NP-1b.X \
+NNP-1b.X N-1c.X P-1c.X NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X \
+P-1e.X NP-1e.X NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X \
+NNP-1g.X N-1h.X P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X \
+P-1j.X NP-1j.X NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X \
+P-streq-1.X NP-streq-1.X NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X \
+NNP-streq-2.X N-streq-3.X P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X \
+P-streq-4.X NP-streq-4.X NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X \
+NNP-streq-5.X N-streq-6.X N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X \
+N-strne-2.X P-strne-2.X NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X \
+NP-strne-3.X NNP-strne-3.X N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X \
+N-strne-5.X P-strne-5.X NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X \
+P-and-1.X NP-and-1.X NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X \
+N-and-3.X P-and-3.X NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X \
+NNP-and-4.X N-or-1.X P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X \
+NP-or-2.X NNP-or-2.X N-or-3.X P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X \
+NP-or-4.X NNP-or-4.X N-eq-1.X P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X \
+NP-eq-2.X NNP-eq-2.X N-eq-3.X P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X \
+NP-eq-4.X NNP-eq-4.X N-eq-5.X P-eq-5.X NP-eq-5.X NNP-eq-5.X N-eq-6.X P-eq-6.X \
+NP-eq-6.X NNP-eq-6.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X P-gt-2.X \
+NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X P-gt-4.X \
+NP-gt-4.X NNP-gt-4.X N-gt-5.X P-gt-5.X NP-gt-5.X NNP-gt-5.X N-lt-1.X P-lt-1.X \
+NP-lt-1.X NNP-lt-1.X N-lt-2.X P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X \
+NP-lt-3.X NNP-lt-3.X N-lt-4.X P-lt-4.X NP-lt-4.X NNP-lt-4.X N-lt-5.X P-lt-5.X \
+NP-lt-5.X NNP-lt-5.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X NP-t2.X \
+NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X 1a.X \
+1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
 streq-3.X streq-4.X streq-5.X streq-6.X strne-1.X strne-2.X strne-3.X \
 strne-4.X strne-5.X strne-6.X and-1.X and-2.X and-3.X and-4.X or-1.X or-2.X \
-or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X \
-lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X t2.X paren-1.X paren-2.X paren-3.X \
-paren-4.X paren-5.X
+or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X eq-6.X gt-1.X gt-2.X gt-3.X \
+gt-4.X gt-5.X lt-1.X lt-2.X lt-3.X lt-4.X lt-5.X inv-1.X t1.X t2.X paren-1.X \
+paren-2.X paren-3.X paren-4.X paren-5.X
 
 run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O \
-ne-5.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E ge-1.O ge-1.E \
-ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O \
-NP-1b.E NNP-1b.O NNP-1b.E N-1c.O N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E \
-NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O P-1d.E NP-1d.O NP-1d.E NNP-1d.O \
-NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O NP-1e.E NNP-1e.O NNP-1e.E N-1f.O \
-N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O \
-P-1g.E NP-1g.O NP-1g.E NNP-1g.O NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O \
-NP-1h.E NNP-1h.O NNP-1h.E N-1i.O N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E \
-NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O P-1j.E NP-1j.O NP-1j.E NNP-1j.O \
-NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O NP-1k.E NNP-1k.O NNP-1k.E \
-N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E NP-streq-1.O NP-streq-1.E \
-NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E P-streq-2.O P-streq-2.E \
-NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E N-streq-3.O N-streq-3.E \
-P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E NNP-streq-3.O NNP-streq-3.E \
-N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E NP-streq-4.O NP-streq-4.E \
-NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E P-streq-5.O P-streq-5.E \
-NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E N-streq-6.O N-streq-6.E \
-N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E NP-strne-1.O NP-strne-1.E \
-NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E P-strne-2.O P-strne-2.E \
-NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E N-strne-3.O N-strne-3.E \
-P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E NNP-strne-3.O NNP-strne-3.E \
-N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E NP-strne-4.O NP-strne-4.E \
-NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E P-strne-5.O P-strne-5.E \
-NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E N-strne-6.O N-strne-6.E \
-N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O NP-and-1.E NNP-and-1.O \
-NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E NP-and-2.O NP-and-2.E \
-NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O P-and-3.E NP-and-3.O \
-NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E P-and-4.O P-and-4.E \
-NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O N-or-1.E P-or-1.O \
-P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O N-or-2.E P-or-2.O \
-P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O N-or-3.E P-or-3.O \
-P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O N-or-4.E P-or-4.O \
-P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O N-eq-1.E P-eq-1.O \
-P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O N-eq-2.E P-eq-2.O \
-P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O N-eq-3.E P-eq-3.O \
-P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O N-eq-4.E P-eq-4.O \
-P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O N-eq-5.E P-eq-5.O \
-P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-gt-1.O N-gt-1.E P-gt-1.O \
-P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O N-gt-2.E P-gt-2.O \
-P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O N-gt-3.E P-gt-3.O \
-P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O N-gt-4.E P-gt-4.O \
-P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-lt-1.O N-lt-1.E P-lt-1.O \
-P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O N-lt-2.E P-lt-2.O \
-P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O N-lt-3.E P-lt-3.O \
-P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O N-lt-4.E P-lt-4.O \
-P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-t1.O N-t1.E P-t1.O \
-P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O P-t2.E NP-t2.O \
-NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O N-paren-2.E \
-N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O N-paren-5.E 1a.O \
-1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O 1g.E 1h.O 1h.E \
-1i.O 1i.E 1j.O 1j.E 1k.O 1k.E streq-1.O streq-1.E streq-2.O streq-2.E \
-streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E streq-6.O \
-streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O strne-3.E \
-strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O and-1.E \
-and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E \
-or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O \
-eq-4.E eq-5.O eq-5.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E \
-lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O \
-t1.E t2.O t2.E paren-1.O paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E \
-paren-4.O paren-4.E paren-5.O paren-5.E
+ne-5.E ne-6.O ne-6.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E \
+le-5.O le-5.E ge-1.O ge-1.E ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E ge-5.O \
+ge-5.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O NP-1b.E NNP-1b.O NNP-1b.E N-1c.O \
+N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O \
+P-1d.E NP-1d.O NP-1d.E NNP-1d.O NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O \
+NP-1e.E NNP-1e.O NNP-1e.E N-1f.O N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E \
+NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O P-1g.E NP-1g.O NP-1g.E NNP-1g.O \
+NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O NP-1h.E NNP-1h.O NNP-1h.E N-1i.O \
+N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O \
+P-1j.E NP-1j.O NP-1j.E NNP-1j.O NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O \
+NP-1k.E NNP-1k.O NNP-1k.E N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E \
+NP-streq-1.O NP-streq-1.E NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E \
+P-streq-2.O P-streq-2.E NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E \
+N-streq-3.O N-streq-3.E P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E \
+NNP-streq-3.O NNP-streq-3.E N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E \
+NP-streq-4.O NP-streq-4.E NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E \
+P-streq-5.O P-streq-5.E NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E \
+N-streq-6.O N-streq-6.E N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E \
+NP-strne-1.O NP-strne-1.E NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E \
+P-strne-2.O P-strne-2.E NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E \
+N-strne-3.O N-strne-3.E P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E \
+NNP-strne-3.O NNP-strne-3.E N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E \
+NP-strne-4.O NP-strne-4.E NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E \
+P-strne-5.O P-strne-5.E NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E \
+N-strne-6.O N-strne-6.E N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O \
+NP-and-1.E NNP-and-1.O NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E \
+NP-and-2.O NP-and-2.E NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O \
+P-and-3.E NP-and-3.O NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E \
+P-and-4.O P-and-4.E NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O \
+N-or-1.E P-or-1.O P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O \
+N-or-2.E P-or-2.O P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O \
+N-or-3.E P-or-3.O P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O \
+N-or-4.E P-or-4.O P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O \
+N-eq-1.E P-eq-1.O P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O \
+N-eq-2.E P-eq-2.O P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O \
+N-eq-3.E P-eq-3.O P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O \
+N-eq-4.E P-eq-4.O P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O \
+N-eq-5.E P-eq-5.O P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-eq-6.O \
+N-eq-6.E P-eq-6.O P-eq-6.E NP-eq-6.O NP-eq-6.E NNP-eq-6.O NNP-eq-6.E N-gt-1.O \
+N-gt-1.E P-gt-1.O P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O \
+N-gt-2.E P-gt-2.O P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O \
+N-gt-3.E P-gt-3.O P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O \
+N-gt-4.E P-gt-4.O P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-gt-5.O \
+N-gt-5.E P-gt-5.O P-gt-5.E NP-gt-5.O NP-gt-5.E NNP-gt-5.O NNP-gt-5.E N-lt-1.O \
+N-lt-1.E P-lt-1.O P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O \
+N-lt-2.E P-lt-2.O P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O \
+N-lt-3.E P-lt-3.O P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O \
+N-lt-4.E P-lt-4.O P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-lt-5.O \
+N-lt-5.E P-lt-5.O P-lt-5.E NP-lt-5.O NP-lt-5.E NNP-lt-5.O NNP-lt-5.E N-t1.O \
+N-t1.E P-t1.O P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O \
+P-t2.E NP-t2.O NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O \
+N-paren-2.E N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O \
+N-paren-5.E 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \
+1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E streq-1.O streq-1.E streq-2.O \
+streq-2.E streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E \
+streq-6.O streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O \
+strne-3.E strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O \
+and-1.E and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O \
+or-2.E or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E \
+eq-4.O eq-4.E eq-5.O eq-5.E eq-6.O eq-6.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O \
+gt-3.E gt-4.O gt-4.E gt-5.O gt-5.E lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E \
+lt-4.O lt-4.E lt-5.O lt-5.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E paren-1.O \
+paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E paren-4.O paren-4.E \
+paren-5.O paren-5.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index b7f377d43..c43d7c3b9 100644
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 416690979..940fab795 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index fb171e3c3..cca84eee5 100644
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index 8d96c0df5..2cd4961cf 100644
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -122,17 +122,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index 1f447b18c..ad9f0748a 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index 4ba9ac4b0..947319721 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -123,17 +123,17 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
 	$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/stripslash.m4 \
 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-	$(top_srcdir)/m4/strpbrk.m4 $(top_srcdir)/m4/strstr.m4 \
-	$(top_srcdir)/m4/strtod.m4 $(top_srcdir)/m4/strtoimax.m4 \
-	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/strverscmp.m4 \
-	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-	$(top_srcdir)/m4/typeof.m4 $(top_srcdir)/m4/tzset.m4 \
-	$(top_srcdir)/m4/uint32_t.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/uintptr_t.m4 $(top_srcdir)/m4/ullong_max.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unicodeio.m4 \
-	$(top_srcdir)/m4/unistd-safer.m4 \
+	$(top_srcdir)/m4/strnumcmp.m4 $(top_srcdir)/m4/strpbrk.m4 \
+	$(top_srcdir)/m4/strstr.m4 $(top_srcdir)/m4/strtod.m4 \
+	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
+	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
+	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
+	$(top_srcdir)/m4/strverscmp.m4 $(top_srcdir)/m4/timespec.m4 \
+	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/typeof.m4 \
+	$(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uint32_t.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/uintptr_t.m4 \
+	$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
 	$(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
 	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
 	$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
-- 
cgit v1.2.3-70-g09d2