Now that we have the new AC_CHECK_DECLS, use it in place of my hack.

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index 4896f179d3d6f811dfdd9e5e6dcda3fb576c838f..f07d11180d1d5c142cc02c9850614e06a13024df 100644 (file)
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
@@ -39,26 +39,9 @@ AC_DEFUN(jm_CHECK_DECLS,
 #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.])
-    AC_DEFINE(HAVE_DECL_NANOSLEEP, 1, [Define if this function is declared.])
-  fi
-
-  jm_CHECK_DECLARATIONS($headers, free lseek malloc \
-                        memchr nanosleep realloc stpcpy strstr strtoul strtoull)
+  AC_CHECK_DECLS(
+    (free lseek malloc memchr nanosleep realloc stpcpy strstr strtoul strtoull),
+    , , $headers)
 ])
 
 dnl FIXME: when autoconf has support for it.