-#serial 17
+#serial 20
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_DEFUN([gl_CHECK_DECLS],
[
- AC_REQUIRE([_jm_DECL_HEADERS])
+ AC_REQUIRE([_gl_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
+#include <string.h>
+#include <stdlib.h>
+
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
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_DEFUN([_gl_DECL_HEADERS],
[
AC_REQUIRE([AC_HEADER_STDC])
AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \