X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=a5560471f2354f82dbf0d683bd21f04afc58ac07;hb=118c7c3af6b537e01580f3ddd29262cdc7ee17b9;hp=09685952c119ad778a4956dc3ed39752e51a0d2e;hpb=8a722e6bf8afdd6cca2024c2867aa6a9b38f0d1d;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index 09685952c..a5560471f 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 16
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -6,6 +6,7 @@ dnl different packages.
 AC_DEFUN(jm_CHECK_DECLS,
 [
   AC_REQUIRE([_jm_DECL_HEADERS])
+  AC_REQUIRE([AC_HEADER_TIME])
   headers='
 #include <stdio.h>
 #if HAVE_STRING_H
@@ -24,27 +25,46 @@ AC_DEFUN(jm_CHECK_DECLS,
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-'
 
-  if test x = y; then
-    dnl This code is deliberately never run via ./configure.
-    dnl FIXME: this is a gross hack to make autoheader put entries
-    dnl for each of these symbols in the config.h.in.
-    dnl Otherwise, I'd have to update acconfig.h every time I change
-    dnl this list of functions.
-    AC_DEFINE(HAVE_DECL_FREE, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_LSEEK, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_MALLOC, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_MEMCHR, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_REALLOC, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STPCPY, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STRSTR, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STRTOUL, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STRTOULL, 1, [Define if this function is declared.])
-  fi
+#include <sys/types.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#if HAVE_UTMP_H
+# include <utmp.h>
+#endif
+'
 
-  jm_CHECK_DECLARATIONS($headers, free lseek malloc \
-                        memchr realloc stpcpy strstr strtoul strtoull)
+  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.
@@ -52,5 +72,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)
+  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h sys/time.h \
+                   utmp.h utmpx.h)
 ])