(jm_MACROS): Replace jm_INCLUDED_REGEX([lib/regex.c]) with gl_REGEX.

Replace jm_FUNC_MKTIME with gl_FUNC_MKTIME.
Remove redundant AC_FUNC_FNMATCH_GNU, jm_FUNC_MKTIME.
Remove AC_FUNC_VPRINTF.
Add gl_ERROR.

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 763a9de..35a84c9 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -38,7 +38,7 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
   jm_CHECK_ALL_TYPES
-  jm_INCLUDED_REGEX([lib/regex.c])
+  gl_REGEX
 
   AC_REQUIRE([UTILS_HOST_OS])
   AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH])
@@ -57,7 +57,7 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_LCHOWN])
   AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY])
   AC_REQUIRE([jm_FUNC_CHOWN])
-  AC_REQUIRE([jm_FUNC_MKTIME])
+  AC_REQUIRE([gl_FUNC_MKTIME])
   AC_REQUIRE([jm_FUNC_LSTAT])
   AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_REQUIRE([jm_FUNC_STAT])
@@ -68,7 +68,6 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_MEMCMP])
   AC_REQUIRE([gl_MEMCOLL])
   AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO])
-  AC_REQUIRE([AC_FUNC_FNMATCH_GNU])
   AC_REQUIRE([jm_FUNC_GROUP_MEMBER])
   AC_REQUIRE([jm_FUNC_PUTENV])
   AC_REQUIRE([jm_AFS])
@@ -77,7 +76,6 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK])
   AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
   AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
-  AC_REQUIRE([jm_FUNC_MKTIME])
   AC_REQUIRE([jm_FUNC_FPENDING])
 
   # This is for od and stat, and any other program that
@@ -87,10 +85,11 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_GETGROUPS])
 
   AC_REQUIRE([AC_FUNC_FSEEKO])
-  AC_REQUIRE([AC_FUNC_VPRINTF])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([gl_FUNC_ALLOCA])
 
+  AC_REQUIRE([gl_ERROR])
+
   AC_CONFIG_LIBOBJ_DIR([lib])
   AC_FUNC_GETLOADAVG