Remove K&R cruft.

[gnulib.git] / m4 / check-decl.m4

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index f49a9c5..4a0fda0 100644 (file)
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,27 +1,17 @@
-#serial 15
+#serial 19
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
 dnl different packages.
-AC_DEFUN(jm_CHECK_DECLS,
+AC_DEFUN([jm_CHECK_DECLS],
 [
   AC_REQUIRE([_jm_DECL_HEADERS])
   AC_REQUIRE([AC_HEADER_TIME])
   headers='
 #include <stdio.h>
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
+
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -38,9 +28,17 @@ AC_DEFUN(jm_CHECK_DECLS,
 # endif
 #endif
 
-#if !HAVE_UTMPX_H
+#if HAVE_UTMP_H
 # include <utmp.h>
 #endif
+
+#if HAVE_GRP_H
+# include <grp.h>
+#endif
+
+#if HAVE_PWD_H
+# include <pwd.h>
+#endif
 '
 
   AC_CHECK_DECLS([
@@ -55,6 +53,7 @@ AC_DEFUN(jm_CHECK_DECLS,
     lseek,
     malloc,
     memchr,
+    memrchr,
     nanosleep,
     realloc,
     stpcpy,
@@ -68,9 +67,9 @@ AC_DEFUN(jm_CHECK_DECLS,
 
 dnl FIXME: when autoconf has support for it.
 dnl This is a little helper so we can require these header checks.
-AC_DEFUN(_jm_DECL_HEADERS,
+AC_DEFUN([_jm_DECL_HEADERS],
 [
   AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h sys/time.h \
-                   utmp.h utmpx.h)
+  AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \
+                   unistd.h sys/time.h utmp.h utmpx.h)
 ])