(gl_PREREQ): Require gl_FUNC_GETLINE rather than

AM_FUNC_GETLINE.  Require gl_FUNC_GETPASS_GNU rather than
gl_FUNC_GETPASS.  Require gl_MBCHAR and gl_MBITER.

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 0618dec541c47bc5d55be4dc0ea637c354381679..68f6bb7e29916754ab271bccf51c639457d042e7 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 61
+#serial 62
 
 dnl We use gl_ for non Autoconf macros.
 m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -31,10 +31,7 @@ AC_DEFUN([gl_PREREQ],
   # We don't yet use c-stack.c.
   # AC_REQUIRE([gl_C_STACK])
 
-  AC_REQUIRE([AM_FUNC_GETLINE])
   AC_REQUIRE([AM_STDBOOL_H])
-  AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
-  AC_REQUIRE([gl_FUNC_MKSTEMP])
   AC_REQUIRE([gl_ALLOCSA])
   AC_REQUIRE([gl_BACKUPFILE])
   AC_REQUIRE([gl_BASENAME])
@@ -58,8 +55,9 @@ AC_DEFUN([gl_PREREQ],
   AC_REQUIRE([gl_FUNC_DUP2])
   AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
   AC_REQUIRE([gl_FUNC_GETHOSTNAME])
+  AC_REQUIRE([gl_FUNC_GETLINE])
   AC_REQUIRE([AC_FUNC_GETLOADAVG])
-  AC_REQUIRE([gl_FUNC_GETPASS])
+  AC_REQUIRE([gl_FUNC_GETPASS_GNU])
   AC_REQUIRE([gl_FUNC_GETUSERSHELL])
   AC_REQUIRE([gl_FUNC_LSTAT])
   AC_REQUIRE([gl_FUNC_MEMCHR])
@@ -68,7 +66,9 @@ AC_DEFUN([gl_PREREQ],
   AC_REQUIRE([gl_FUNC_MEMPCPY])
   AC_REQUIRE([gl_FUNC_MEMRCHR])
   AC_REQUIRE([gl_FUNC_MEMSET])
+  AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
   AC_REQUIRE([gl_FUNC_MKTIME])
+  AC_REQUIRE([gl_FUNC_MKSTEMP])
   AC_REQUIRE([gl_FUNC_NONREENTRANT_EUIDACCESS])
   AC_REQUIRE([gl_FUNC_READLINK])
   AC_REQUIRE([gl_FUNC_RMDIR])
@@ -109,6 +109,8 @@ AC_DEFUN([gl_PREREQ],
   AC_REQUIRE([gl_LINEBUFFER])
   AC_REQUIRE([gl_LOCALCHARSET])
   AC_REQUIRE([gl_LONG_OPTIONS])
+  AC_REQUIRE([gl_MBCHAR])
+  AC_REQUIRE([gl_MBITER])
   AC_REQUIRE([gl_MBSWIDTH])
   AC_REQUIRE([gl_MD5])
   AC_REQUIRE([gl_MEMCOLL])