Sync with gnulib.

[bison.git] / m4 / prereq.m4

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index b29e725b63062e2daa76788b39480ec8364d4715..93001ae8ed4cf30ce9416062a9876374fefd195f 100644 (file)
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,7 +1,10 @@
-#serial 26
+#serial 28                                                         -*- Autoconf -*-
 
-dnl These are the prerequisite macros for files in the lib/
-dnl directories of the fileutils, sh-utils, and textutils packages.
+dnl We use jm_ for non Autoconf macros.
+m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
+
+# These are the prerequisite macros for files in the lib/
+# directories of the fileutils, sh-utils, and textutils packages.
 
 AC_DEFUN([jm_PREREQ],
 [
@@ -29,6 +32,20 @@ AC_DEFUN([jm_PREREQ],
   jm_PREREQ_XREADLINK
 ])
 
+AC_DEFUN([jm_PREREQ_ARGMATCH],
+[
+  AC_REQUIRE([jm_PREREQ_QUOTEARG])
+  AC_REPLACE_FUNCS(strcasecmp strncasecmp)
+])
+
+# Ask for argmatch.[ch], and set it up.
+AC_DEFUN([jm_FUNC_ARGMATCH],
+[
+  AC_REQUIRE([jm_PREREQ_ARGMATCH])
+  AC_LIBOBJ([argmatch])
+  AC_LIBSOURCES([argmatch.c, argmatch.h])
+])
+
 AC_DEFUN([jm_PREREQ_ADDEXT],
 [
   dnl For addext.c.
@@ -77,13 +94,6 @@ AC_DEFUN([jm_PREREQ_HARD_LOCALE],
   AM_C_PROTOTYPES
 ])
 
-# AC_DEFUN([jm_PREREQ_HASH],
-# [
-#   AC_CHECK_HEADERS(stdlib.h)
-#   AC_HEADER_STDBOOL
-#   AC_REQUIRE([jm_CHECK_DECLS])
-# ])
-
 # If you use human.c, you need the following files:
 # inttypes.m4 ulonglong.m4
 AC_DEFUN([jm_PREREQ_HUMAN],
@@ -114,6 +124,7 @@ AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
   AC_CHECK_FUNCS(isascii iswprint)
   jm_FUNC_MBRTOWC
+  jm_FUNC_MEMCMP
   AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A