Merge from coreutils.

[gnulib.git] / m4 / prereq.m4

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 52b14d6..78c8913 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 36
+#serial 37
 
 dnl We use jm_ for non Autoconf macros.
 m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -33,7 +33,7 @@ AC_DEFUN([jm_PREREQ],
   AC_REQUIRE([gl_FUNC_EUIDACCESS])
   AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
   AC_REQUIRE([gl_FUNC_GETHOSTNAME])
-  AC_REQUIRE([gl_FUNC_GETLOADAVG])
+  AC_REQUIRE([AC_FUNC_GETLOADAVG])
   AC_REQUIRE([gl_FUNC_GETPASS])
   AC_REQUIRE([gl_FUNC_GETUSERSHELL])
   AC_REQUIRE([gl_FUNC_MEMCHR])
@@ -67,10 +67,15 @@ AC_DEFUN([jm_PREREQ],
   AC_REQUIRE([gl_GETNDELIM2])
   AC_REQUIRE([gl_GETOPT])
   AC_REQUIRE([gl_GETPAGESIZE])
+  AC_REQUIRE([gl_GETUGROUPS])
   AC_REQUIRE([gl_HARD_LOCALE])
   AC_REQUIRE([gl_HASH])
   AC_REQUIRE([gl_HUMAN])
+  AC_REQUIRE([gl_IDCACHE])
+  AC_REQUIRE([gl_LONG_OPTIONS])
+  AC_REQUIRE([gl_MAKEPATH])
   AC_REQUIRE([gl_MBSWIDTH])
+  AC_REQUIRE([gl_MD5])
   AC_REQUIRE([gl_MEMCOLL])
   AC_REQUIRE([gl_MODECHANGE])
   AC_REQUIRE([gl_MOUNTLIST])
@@ -82,6 +87,7 @@ AC_DEFUN([jm_PREREQ],
   AC_REQUIRE([gl_POSIXVER])
   AC_REQUIRE([gl_QUOTEARG])
   AC_REQUIRE([gl_QUOTE])
+  AC_REQUIRE([gl_READTOKENS])
   AC_REQUIRE([gl_READUTMP])
   AC_REQUIRE([gl_REGEX])
   AC_REQUIRE([gl_SAFE_READ])