X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=f9202eab7eaa7f59490475b3a8162de9fa672867;hb=d5cb2b575ebfd62dd3a52ab3398fe4b1eae03aed;hp=a223bf95253ab51d3ed22e1a3bc16c37d421bfe8;hpb=d833adac51f26c7c9cf2ee3a4554a4363f23e8f9;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index a223bf952..f9202eab7 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,10 +1,12 @@
-#serial 6
+#serial 10
 
 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_REQUIRE([_jm_DECL_HEADERS])
+  AC_REQUIRE([AC_HEADER_TIME])
   headers='
 #include <stdio.h>
 #if HAVE_STRING_H
@@ -17,31 +19,53 @@ AC_DEFUN(jm_CHECK_DECLS,
 #  include <strings.h>
 # endif
 #endif
-#if STDC_HEADERS
+#if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#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_UTMPX_H
+# include <utmp.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
+  AC_CHECK_DECLS((
+    free,
+    getenv,
+    geteuid,
+    getlogin,
+    getutent,
+    lseek,
+    malloc,
+    memchr,
+    nanosleep,
+    realloc,
+    stpcpy,
+    strstr,
+    strtoul,
+    strtoull,
+    ttyname), , , $headers)
+])
 
-  jm_CHECK_DECLARATIONS($headers, free lseek malloc \
-                        memchr realloc stpcpy strstr strtoul strtoull)
+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_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h sys/time.h \
+                   utmpx.h)
 ])