Require jm_AC_PREREQ_XSTRTOUMAX.

[gnulib.git] / m4 / jm-macros.m4

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index e56d03a..ec3433d 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 7
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -6,14 +6,18 @@ AC_DEFUN(jm_MACROS,
 [
   AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
 
+  GNU_PACKAGE="GNU $PACKAGE"
+  AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
+    [The concatenation of the strings \`GNU ', and PACKAGE.])
+  AC_SUBST(GNU_PACKAGE)
+
   dnl This macro actually runs replacement code.  See isc-posix.m4.
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
-  AC_REQUIRE([jm_WITH_REGEX])
+  jm_INCLUDED_REGEX([lib/regex.c])
+
   AC_REQUIRE([jm_ASSERT])
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-  AC_CHECK_TYPE(ssize_t, int)
   AC_REQUIRE([jm_STRUCT_UTIMBUF])
   AC_REQUIRE([jm_STRUCT_DIRENT_D_TYPE])
   AC_REQUIRE([jm_STRUCT_DIRENT_D_INO])
@@ -32,5 +36,31 @@ AC_DEFUN(jm_MACROS,
   AC_REQUIRE([jm_FUNC_MEMCMP])
   AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO])
   AC_REQUIRE([jm_FUNC_FNMATCH])
+  AC_REQUIRE([jm_AFS])
+  AC_REQUIRE([jm_AC_PREREQ_XSTRTOUMAX])
   AC_REPLACE_FUNCS(strcasecmp strncasecmp)
+
+  # By default, argmatch should fail calling usage (1).
+  AC_DEFINE(ARGMATCH_DIE, [usage (1)],
+           [Define to the function xargmatch calls on failures.])
+  AC_DEFINE(ARGMATCH_DIE_DECL, [extern void usage ()],
+           [Define to the declaration of the xargmatch failure function.])
+
+  dnl Used to define SETVBUF in sys2.h.
+  AC_FUNC_SETVBUF_REVERSED
+
+])
+
+AC_DEFUN(jm_CHECK_ALL_TYPES,
+[
+  AC_TYPE_GETGROUPS
+  AC_TYPE_MODE_T
+  AC_TYPE_OFF_T
+  AC_TYPE_PID_T
+  AC_TYPE_SIGNAL
+  AC_TYPE_SIZE_T
+  AC_TYPE_UID_T
+  AC_CHECK_TYPE(ino_t, unsigned long)
+  AC_CHECK_TYPE(ssize_t, int)
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 ])