X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=5768383bd8735afdb424543e32f5f2d9c22f9582;hb=285eedf281c872802a54df805936b7593c95518e;hp=6788d04674ded93f61c99666ce42ccaaea98551e;hpb=a3f6402906b3fe3772a4a626fcc9a9535745bf8e;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 6788d0467..5768383bd 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,16 +1,17 @@
-#serial 38   -*- autoconf -*-
+#serial 39   -*- autoconf -*-
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
-AC_DEFUN(jm_MACROS,
+AC_DEFUN([jm_MACROS],
 [
-  AC_PREREQ(2.49d)
+  AC_PREREQ(2.52)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
     [The concatenation of the strings `GNU ', and PACKAGE.])
   AC_SUBST(GNU_PACKAGE)
 
+  AM_MISSING_PROG(HELP2MAN, help2man)
   AC_SUBST(OPTIONAL_BIN_PROGS)
   AC_SUBST(OPTIONAL_BIN_ZCRIPTS)
   AC_SUBST(MAN)
@@ -22,9 +23,10 @@ AC_DEFUN(jm_MACROS,
   jm_CHECK_ALL_TYPES
   jm_INCLUDED_REGEX([lib/regex.c])
 
+  AC_REQUIRE([UTILS_HOST_OS])
+  AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH])
   AC_REQUIRE([jm_BISON])
   AC_REQUIRE([jm_ASSERT])
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
   AC_REQUIRE([jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])
   AC_REQUIRE([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO])
@@ -51,6 +53,7 @@ AC_DEFUN(jm_MACROS,
   AC_REQUIRE([jm_FUNC_PUTENV])
   AC_REQUIRE([jm_AFS])
   AC_REQUIRE([jm_AC_PREREQ_XSTRTOUMAX])
+  AC_REQUIRE([jm_AC_PREREQ_XSTRTOIMAX])
   AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK])
   AC_REQUIRE([AM_FUNC_ERROR_AT_LINE])
   AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
@@ -113,6 +116,7 @@ AC_DEFUN(jm_MACROS,
     AC_CHECK_FUNCS(clock_gettime)
   LIBS=$fetish_saved_libs
   AC_CHECK_FUNCS(gettimeofday)
+  AC_FUNC_GETTIMEOFDAY_CLOBBER
 
   AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
   AC_REQUIRE([jm_FUNC_UTIME])
@@ -120,6 +124,7 @@ AC_DEFUN(jm_MACROS,
   AC_CHECK_FUNCS( \
     acl \
     bcopy \
+    canonicalize_file_name \
     endgrent \
     endpwent \
     fchdir \
@@ -197,7 +202,7 @@ AC_DEFUN(jm_MACROS,
 # These tests must be run before any use of AC_CHECK_TYPE,
 # because that macro compiles code that tests e.g., HAVE_UNISTD_H.
 # See the definition of ac_includes_default in `configure'.
-AC_DEFUN(jm_CHECK_ALL_HEADERS,
+AC_DEFUN([jm_CHECK_ALL_HEADERS],
 [
   AC_CHECK_HEADERS( \
     errno.h  \
@@ -241,7 +246,7 @@ AC_DEFUN(jm_CHECK_ALL_HEADERS,
 ])
 
 # This macro must be invoked before any tests that run the compiler.
-AC_DEFUN(jm_CHECK_ALL_TYPES,
+AC_DEFUN([jm_CHECK_ALL_TYPES],
 [
   # FIXME: I shouldn't have to require this macro here.  Rather, it should
   # be required by any autoconf macro that performs a compile-time test or