X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=b282bdebc7d7dfb50764b07767ec588779c6991b;hb=1c245fc3bf5b1594a0b8c781eabf674072a7657e;hp=f07d11180d1d5c142cc02c9850614e06a13024df;hpb=b5603508dacdc19a8db3b20346eff8c0462a3785;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index f07d11180..b282bdebc 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 17
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -37,11 +37,42 @@ AC_DEFUN(jm_CHECK_DECLS,
 #  include <time.h>
 # endif
 #endif
+
+#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 lseek malloc memchr nanosleep realloc stpcpy strstr strtoul strtoull),
-    , , $headers)
+  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)
 ])
 
 dnl FIXME: when autoconf has support for it.
@@ -49,5 +80,6 @@ dnl This is a little helper so we can require these header checks.
 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)
+  AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \
+                   unistd.h sys/time.h utmp.h utmpx.h)
 ])