X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=b374705a0210577aca897f30c1ccbfc2cdab0d00;hb=ca72a0103a972623842c3933a2e5a30d2622e6d7;hp=b1e0a45828676cdaa08e9f7e1c985e6ec337ac0d;hpb=644718b83ea639946b2da9d1785cd0c6fc002728;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index b1e0a4582..b374705a0 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,9 +1,9 @@
-#serial 15
+#serial 18
 
 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])
@@ -38,23 +38,32 @@ 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([
     free,
     getenv,
     geteuid,
-    getgrgid
+    getgrgid,
     getlogin,
-    getpwuid
-    getuid
+    getpwuid,
+    getuid,
     getutent,
     lseek,
     malloc,
     memchr,
+    memrchr,
     nanosleep,
     realloc,
     stpcpy,
@@ -68,9 +77,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)
 ])