.

51 files changed, 295 insertions, 149 deletions

diff --git a/Makefile.in b/Makefile.in
index a1b13af60..12c168cbc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
@@ -213,7 +215,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.ac m4/acl.m4 m4/afs.m4 m4/assert.m4 m4/bison.m4 m4/boottime.m4 m4/c-stack.m4 m4/canonicalize.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 m4/d-ino.m4 m4/d-type.m4 m4/dirfd.m4 m4/dos.m4 m4/error.m4 m4/fpending.m4 m4/fstypename.m4 m4/fsusage.m4 m4/ftruncate.m4 m4/ftw.m4 m4/getcwd-path-max.m4 m4/getcwd.m4 m4/getgroups.m4 m4/getline.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/glibc.m4 m4/glibc21.m4 m4/group-member.m4 m4/host-os.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/isc-posix.m4 m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 m4/jm-winsz1.m4 m4/jm-winsz2.m4 m4/lchown.m4 m4/lcmessage.m4 m4/lib-check.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/link-follow.m4 m4/longlong.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 m4/mbrtowc.m4 m4/mbswidth.m4 m4/memcmp.m4 m4/mkdir-slash.m4 m4/mkstemp.m4 m4/nanosleep.m4 m4/onceonly.m4 m4/open-max.m4 m4/perl.m4 m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/readdir.m4 m4/regex.m4 m4/rename.m4 m4/restrict.m4 m4/rmdir-errno.m4 m4/search-libs.m4 m4/st_dm_mode.m4 m4/st_mtim.m4 m4/stat.m4 m4/stdbool.m4 m4/strftime.m4 m4/timespec.m4 m4/unlink-busy.m4 m4/uptime.m4 m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/xstrtoimax.m4 m4/xstrtoumax.m4
+$(ACLOCAL_M4):  configure.ac m4/acl.m4 m4/afs.m4 m4/assert.m4 m4/bison.m4 m4/boottime.m4 m4/c-stack.m4 m4/canonicalize.m4 m4/check-decl.m4 m4/chown.m4 m4/codeset.m4 m4/d-ino.m4 m4/d-type.m4 m4/dirfd.m4 m4/dos.m4 m4/error.m4 m4/fpending.m4 m4/fstypename.m4 m4/fsusage.m4 m4/ftruncate.m4 m4/ftw.m4 m4/getcwd-path-max.m4 m4/getcwd.m4 m4/getgroups.m4 m4/getline.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/glibc.m4 m4/glibc21.m4 m4/group-member.m4 m4/host-os.m4 m4/human.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/isc-posix.m4 m4/jm-glibc-io.m4 m4/jm-macros.m4 m4/jm-mktime.m4 m4/jm-winsz1.m4 m4/jm-winsz2.m4 m4/lchown.m4 m4/lcmessage.m4 m4/lib-check.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/link-follow.m4 m4/longlong.m4 m4/ls-mntd-fs.m4 m4/lstat.m4 m4/mbrtowc.m4 m4/mbswidth.m4 m4/memcmp.m4 m4/mkdir-slash.m4 m4/mkstemp.m4 m4/nanosleep.m4 m4/onceonly.m4 m4/open-max.m4 m4/perl.m4 m4/prereq.m4 m4/progtest.m4 m4/putenv.m4 m4/readdir.m4 m4/regex.m4 m4/rename.m4 m4/restrict.m4 m4/rmdir-errno.m4 m4/search-libs.m4 m4/st_dm_mode.m4 m4/st_mtim.m4 m4/stat.m4 m4/stdbool.m4 m4/strftime.m4 m4/timespec.m4 m4/unlink-busy.m4 m4/uptime.m4 m4/utimbuf.m4 m4/utime.m4 m4/utimes.m4 m4/xstrtoimax.m4 m4/xstrtoumax.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
diff --git a/aclocal.m4 b/aclocal.m4
index 2a71b9059..c9ee7916e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -860,7 +860,7 @@ WARNING: You don't seem to have perl5.003 or newer installed, or you lack
 ] )
 ])
 
-#serial 62   -*- autoconf -*-
+#serial 63   -*- autoconf -*-
 
 m4_undefine([AC_LANG_SOURCE(C)])
 dnl The following is identical to the definition in c.m4
@@ -884,7 +884,7 @@ dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
 AC_DEFUN([jm_MACROS],
 [
-  AC_PREREQ(2.56)
+  AC_PREREQ(2.57)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
@@ -1096,6 +1096,7 @@ AC_DEFUN([jm_MACROS],
   AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)])
   AC_CHECK_FUNC([lstat], , [AC_LIBOBJ(lstat-stub)])
   AC_CHECK_FUNC([readlink], , [AC_LIBOBJ(readlink-stub)])
+  AC_REQUIRE([AM_STDBOOL_H])
 
 ])
 
@@ -1810,7 +1811,7 @@ AC_DEFUN([jm_PREREQ],
   AC_REQUIRE([jm_PREREQ_GETPAGESIZE])
   AC_REQUIRE([jm_PREREQ_HARD_LOCALE])
   AC_REQUIRE([jm_PREREQ_HASH])
-  AC_REQUIRE([jm_PREREQ_HUMAN])
+  AC_REQUIRE([gl_HUMAN])
   AC_REQUIRE([jm_PREREQ_MBSWIDTH])
   AC_REQUIRE([jm_PREREQ_MEMCHR])
   AC_REQUIRE([jm_PREREQ_PHYSMEM])
@@ -1878,17 +1879,6 @@ AC_DEFUN([jm_PREREQ_HASH],
   AC_REQUIRE([jm_CHECK_DECLS])
 ])
 
-# If you use human.c, you need the following files:
-# inttypes.m4 longlong.m4
-AC_DEFUN([jm_PREREQ_HUMAN],
-[
-  AC_CHECK_HEADERS(locale.h)
-  AC_CHECK_DECLS([getenv])
-  AC_CHECK_FUNCS(localeconv)
-  AC_REQUIRE([AC_HEADER_STDBOOL])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-])
-
 AC_DEFUN([jm_PREREQ_MEMCHR],
 [
   AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
@@ -2082,6 +2072,185 @@ AC_DEFUN([jm_PREREQ_ERROR],
   AC_HEADER_STDC
 ])
 
+# human.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_HUMAN],
+[
+  dnl Prerequisites of lib/human.h.
+  AC_REQUIRE([AM_STDBOOL_H])
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+
+  dnl Prerequisites of lib/human.c.
+  AC_CHECK_HEADERS_ONCE(locale.h stdlib.h string.h)
+  AC_CHECK_DECLS_ONCE(getenv)
+  AC_CHECK_FUNCS_ONCE(localeconv)
+])
+
+# Check for stdbool.h that conforms to C99.
+
+# Copyright (C) 2002-2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# Prepare for substituting <stdbool.h> if it is not supported.
+
+AC_DEFUN([AM_STDBOOL_H],
+[
+  AC_REQUIRE([AC_HEADER_STDBOOL])
+
+  # Define two additional variables used in the Makefile substitution.
+
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
+  AC_SUBST([STDBOOL_H])
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
+  AC_SUBST([HAVE__BOOL])
+])
+
+# This macro is only needed in autoconf <= 2.54.  Newer versions of autoconf
+# have this macro built-in.
+
+AC_DEFUN([AC_HEADER_STDBOOL],
+  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
+     [ac_cv_header_stdbool_h],
+     [AC_TRY_COMPILE(
+	[
+	  #include <stdbool.h>
+	  #ifndef bool
+	   "error: bool is not defined"
+	  #endif
+	  #ifndef false
+	   "error: false is not defined"
+	  #endif
+	  #if false
+	   "error: false is not 0"
+	  #endif
+	  #ifndef true
+	   "error: false is not defined"
+	  #endif
+	  #if true != 1
+	   "error: true is not 1"
+	  #endif
+	  #ifndef __bool_true_false_are_defined
+	   "error: __bool_true_false_are_defined is not defined"
+	  #endif
+
+	  struct s { _Bool s: 1; _Bool t; } s;
+
+	  char a[true == 1 ? 1 : -1];
+	  char b[false == 0 ? 1 : -1];
+	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+	  char d[(bool) -0.5 == true ? 1 : -1];
+	  bool e = &s;
+	  char f[(_Bool) -0.0 == false ? 1 : -1];
+	  char g[true];
+	  char h[sizeof (_Bool)];
+	  char i[sizeof s.t];
+	],
+	[ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ],
+	[ac_cv_header_stdbool_h=yes],
+	[ac_cv_header_stdbool_h=no])])
+   AC_CHECK_TYPES([_Bool])
+   if test $ac_cv_header_stdbool_h = yes; then
+     AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
+   fi])
+
+#serial 6
+
+dnl From Paul Eggert.
+
+AC_PREREQ(2.52)
+
+# Define intmax_t to long or long long if <inttypes.h> doesn't define.
+
+AC_DEFUN([jm_AC_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_CHECK_TYPE(intmax_t, ,
+    [test $ac_cv_type_long_long = yes \
+       && ac_type='long long' \
+       || ac_type='long'
+     AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
+       [Define to widest signed type if <inttypes.h> doesn't define.])])
+])
+
+# Define uintmax_t to unsigned long or unsigned long long
+# if <inttypes.h> doesn't define.
+
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_CHECK_TYPE(uintmax_t, ,
+    [test $ac_cv_type_unsigned_long_long = yes \
+       && ac_type='unsigned long long' \
+       || ac_type='unsigned long'
+     AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+       [Define to widest unsigned type if <inttypes.h> doesn't define.])])
+])
+
+#serial 2
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the long long type.])
+  fi
+])
+
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the unsigned long long type.])
+  fi
+])
+
 #serial 7
 
 dnl autoconf tests required for use of mbswidth.c
@@ -2187,69 +2356,6 @@ AC_DEFUN([AC_SEARCH_LIBS],
   fi
 ])
 
-# Check for stdbool.h that conforms to C99.
-
-# Copyright (C) 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AC_HEADER_STDBOOL],
-  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
-     [ac_cv_header_stdbool_h],
-     [AC_TRY_COMPILE(
-	[
-	  #include <stdbool.h>
-	  #ifndef bool
-	   "error: bool is not defined"
-	  #endif
-	  #ifndef false
-	   "error: false is not defined"
-	  #endif
-	  #if false
-	   "error: false is not 0"
-	  #endif
-	  #ifndef true
-	   "error: false is not defined"
-	  #endif
-	  #if true != 1
-	   "error: true is not 1"
-	  #endif
-	  #ifndef __bool_true_false_are_defined
-	   "error: __bool_true_false_are_defined is not defined"
-	  #endif
-
-	  struct s { _Bool s: 1; _Bool t; } s;
-
-	  char a[true == 1 ? 1 : -1];
-	  char b[false == 0 ? 1 : -1];
-	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-	  char d[(bool) -0.5 == true ? 1 : -1];
-	  bool e = &s;
-	  char f[(_Bool) -0.0 == false ? 1 : -1];
-	  char g[true];
-	  char h[sizeof (_Bool)];
-	  char i[sizeof s.t];
-	],
-	[ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ],
-	[ac_cv_header_stdbool_h=yes],
-	[ac_cv_header_stdbool_h=no])])
-   if test $ac_cv_header_stdbool_h = yes; then
-     AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
-   fi])
-
 
 # Copyright 1996, 1997, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
 
@@ -2399,75 +2505,6 @@ esac
 
 AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
 
-#serial 6
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.52)
-
-# Define intmax_t to long or long long if <inttypes.h> doesn't define.
-
-AC_DEFUN([jm_AC_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
-  AC_CHECK_TYPE(intmax_t, ,
-    [test $ac_cv_type_long_long = yes \
-       && ac_type='long long' \
-       || ac_type='long'
-     AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
-       [Define to widest signed type if <inttypes.h> doesn't define.])])
-])
-
-# Define uintmax_t to unsigned long or unsigned long long
-# if <inttypes.h> doesn't define.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-  AC_CHECK_TYPE(uintmax_t, ,
-    [test $ac_cv_type_unsigned_long_long = yes \
-       && ac_type='unsigned long long' \
-       || ac_type='unsigned long'
-     AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-       [Define to widest unsigned type if <inttypes.h> doesn't define.])])
-])
-
-#serial 2
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG if 'long long' works.
-
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
-[
-  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
-  [AC_TRY_LINK([long long ll = 1; int i = 63;],
-    [long long llmax = (long long) -1;
-     return ll << i | ll >> i | llmax / ll | llmax % ll;],
-    ac_cv_type_long_long=yes,
-    ac_cv_type_long_long=no)])
-  if test $ac_cv_type_long_long = yes; then
-    AC_DEFINE(HAVE_LONG_LONG, 1,
-      [Define if you have the long long type.])
-  fi
-])
-
-# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the unsigned long long type.])
-  fi
-])
-
 #serial 7
 
 AC_DEFUN([jm_FUNC_MEMCMP],
diff --git a/config.hin b/config.hin
index 5ca85f180..b9b4b716d 100644
--- a/config.hin
+++ b/config.hin
@@ -1089,6 +1089,9 @@
 /* Define if readdir is found to work properly in some unusual cases. */
 #undef HAVE_WORKING_READDIR
 
+/* Define to 1 if the system has the type `_Bool'. */
+#undef HAVE__BOOL
+
 /* Define to 1 if you have the external variable, _system_configuration with a
    member named physmem. */
 #undef HAVE__SYSTEM_CONFIGURATION
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 847ac6153..2ea70d942 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -116,6 +117,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index db3a599b5..d371c1d23 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -67,6 +67,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -110,6 +111,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
@@ -263,10 +265,11 @@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
 BUILT_SOURCES = getdate.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+MOSTLYCLEANFILES = stdbool.h
 
 EXTRA_DIST = config.charset ref-add.sin ref-del.sin \
-  fnmatch_loop.c inttostr.c inttostr.h
-
+  fnmatch_loop.c inttostr.c inttostr.h\
+stdbool.hin
 
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
@@ -736,6 +739,7 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -845,6 +849,12 @@ uninstall-local: all-local
 charset.alias: config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
 	mv t-$@ $@
+
+# Create stdbool.h on systems that lack a working one.
+all-local $(lib_OBJECTS): $(STDBOOL_H)
+stdbool.h: stdbool.hin
+	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool.hin > t-$@
+	mv t-$@ $@
 .sin.sed:
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
 	mv t-$@ $@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 5ce5a8860..df3a490eb 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/src/Makefile.in b/src/Makefile.in
index b504aab66..dee8b5141 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -69,6 +69,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -112,6 +113,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7130e23e7..d9fa67524 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in
index 934155f7f..e161df205 100644
--- a/tests/basename/Makefile.in
+++ b/tests/basename/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in
index 07173a3df..430fe8bea 100644
--- a/tests/chgrp/Makefile.in
+++ b/tests/chgrp/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in
index 036ac7cea..28ddc1b92 100644
--- a/tests/chmod/Makefile.in
+++ b/tests/chmod/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in
index 2a1df18e2..73a84dac3 100644
--- a/tests/chown/Makefile.in
+++ b/tests/chown/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in
index 534589742..a89e6eb24 100644
--- a/tests/cp/Makefile.in
+++ b/tests/cp/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 959fbec7e..1c2bd4269 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index 27cacbee5..307884ca6 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in
index 4ea165155..600c37856 100644
--- a/tests/dd/Makefile.in
+++ b/tests/dd/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in
index d1ffad899..fc2bf76c5 100644
--- a/tests/dircolors/Makefile.in
+++ b/tests/dircolors/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in
index 3f45fd0fe..5817cdac1 100644
--- a/tests/du/Makefile.in
+++ b/tests/du/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/expr/Makefile.in b/tests/expr/Makefile.in
index 29826f02c..309d0ecbc 100644
--- a/tests/expr/Makefile.in
+++ b/tests/expr/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in
index 79ff355d2..0c44d02ff 100644
--- a/tests/factor/Makefile.in
+++ b/tests/factor/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/fmt/Makefile.in b/tests/fmt/Makefile.in
index 3b3cc6f5d..4de7a7c41 100644
--- a/tests/fmt/Makefile.in
+++ b/tests/fmt/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index bc354fabc..2fdd35727 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index e79c45a49..35ad0cb48 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 961416da0..4baaf0a12 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in
index 9b15dcf53..6fa725731 100644
--- a/tests/ln/Makefile.in
+++ b/tests/ln/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in
index d431f3828..5d3183c7f 100644
--- a/tests/ls-2/Makefile.in
+++ b/tests/ls-2/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in
index 7661d258c..67524653a 100644
--- a/tests/ls/Makefile.in
+++ b/tests/ls/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index ef54b4e32..6002217b8 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index b3804d911..02faccb93 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index e51cf5f8d..e911b145c 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in
index 43a361c19..ca1ca7ae9 100644
--- a/tests/mv/Makefile.in
+++ b/tests/mv/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/od/Makefile.in b/tests/od/Makefile.in
index 5055cee6b..2cbda13e0 100644
--- a/tests/od/Makefile.in
+++ b/tests/od/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index f5cdc175a..b224f98c5 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in
index 2079fb506..6b94e6c70 100644
--- a/tests/rm/Makefile.in
+++ b/tests/rm/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in
index 6964cd9ad..d87d1bac4 100644
--- a/tests/rmdir/Makefile.in
+++ b/tests/rmdir/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in
index 87a3906a4..3ae0454a1 100644
--- a/tests/seq/Makefile.in
+++ b/tests/seq/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/sha1sum/Makefile.in b/tests/sha1sum/Makefile.in
index 559b0ed2b..10a91fc00 100644
--- a/tests/sha1sum/Makefile.in
+++ b/tests/sha1sum/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in
index 5eeb078d7..a4696b235 100644
--- a/tests/shred/Makefile.in
+++ b/tests/shred/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 48b312dc0..1c72e1489 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in
index fb047a34b..75076fee7 100644
--- a/tests/stty/Makefile.in
+++ b/tests/stty/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index a22b94d7a..dccc0f90a 100644
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index d3526964d..ee32473be 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index 491dd1af2..13eb317f8 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 3c2c9a829..ce2d5aec8 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index a18db4674..dc7ab15a7 100644
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in
index 6646a6a40..406920728 100644
--- a/tests/touch/Makefile.in
+++ b/tests/touch/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index ef13d9f79..4cedbf4e4 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index 8a56754d4..4115b33c7 100644
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index b9cd2524c..67685215a 100644
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index 81823ff07..e86199904 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index 89e21191b..13a77a1b5 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -64,6 +64,7 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GNU_PACKAGE = @GNU_PACKAGE@
+HAVE__BOOL = @HAVE__BOOL@
 HELP2MAN = @HELP2MAN@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -107,6 +108,7 @@ SEQ_LIBM = @SEQ_LIBM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQRT_LIBM = @SQRT_LIBM@
+STDBOOL_H = @STDBOOL_H@
 STRIP = @STRIP@
 U = @U@
 USE_NLS = @USE_NLS@