-#serial 6
+#serial 12
dnl This is just a wrapper function to encapsulate this kludge.
dnl Putting it in a separate file like this helps share it between
AC_DEFUN(jm_CHECK_DECLS,
[
AC_REQUIRE([_jm_DECL_HEADERS])
+ AC_REQUIRE([AC_HEADER_TIME])
headers='
#include <stdio.h>
#if HAVE_STRING_H
#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_UTMPX_H
+# include <utmp.h>
+#endif
+'
- jm_CHECK_DECLARATIONS($headers, free lseek malloc \
- memchr realloc stpcpy strstr strtoul strtoull)
+ AC_CHECK_DECLS([
+ free,
+ getenv,
+ geteuid,
+ getlogin,
+ getutent,
+ lseek,
+ malloc,
+ memchr,
+ nanosleep,
+ realloc,
+ stpcpy,
+ strndup,
+ strstr,
+ strtoul,
+ strtoull,
+ ttyname], , , $headers)
])
dnl FIXME: when autoconf has support for it.
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 \
+ utmpx.h)
])