X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=b374705a0210577aca897f30c1ccbfc2cdab0d00;hb=455b3a9a5e1861152fe403dea25636586d256544;hp=f9202eab7eaa7f59490475b3a8162de9fa672867;hpb=9b1445bd01af11c9c2b508e2c642fa415fb9c829;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index f9202eab7..b374705a0 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,9 +1,9 @@
-#serial 10
+#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,34 +38,48 @@ 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((
+  AC_CHECK_DECLS([
     free,
     getenv,
     geteuid,
+    getgrgid,
     getlogin,
+    getpwuid,
+    getuid,
     getutent,
     lseek,
     malloc,
     memchr,
+    memrchr,
     nanosleep,
     realloc,
     stpcpy,
+    strndup,
+    strnlen,
     strstr,
     strtoul,
     strtoull,
-    ttyname), , , $headers)
+    ttyname], , , $headers)
 ])
 
 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 \
-                   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)
 ])