X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=45dfc5da3c6285b47bfdd508c4ee924c53bb89f8;hb=345b05ad77d79c84374008dcbc3cbd1d879c7e93;hp=58e869e7491578ec368d172447475b9207ecd59f;hpb=a46a42aee90161486ba200f9b027af24b3cd7bcd;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index 58e869e74..45dfc5da3 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,16 +1,65 @@
+#serial 9
+
 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,
 [
-  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_CHECK_FUNCS(DECL_FREE DECL_MALLOC DECL_MEMCHR DECL_REALLOC \
-		   DECL_STPCPY DECL_STRSTR)
-  fi
-  jm_CHECK_DECLARATIONS(free malloc memchr realloc stpcpy strstr)
+  AC_REQUIRE([_jm_DECL_HEADERS])
+  AC_REQUIRE([AC_HEADER_TIME])
+  headers='
+#include <stdio.h>
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#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
+'
+
+  AC_CHECK_DECLS((
+    free,
+    getenv,
+    geteuid,
+    getlogin,
+    lseek,
+    malloc,
+    memchr,
+    nanosleep,
+    realloc,
+    stpcpy,
+    strstr,
+    strtoul,
+    strtoull,
+    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_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_HEADERS(memory.h string.h strings.h stdlib.h unistd.h sys/time.h)
 ])