X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=e482169dfcf76291001bf7f921e69353a4c31ca1;hb=e0c32dcca18db4e9122548b542022206e2ae292d;hp=866e52aa30916213bc97faad3c9768ab6aa82129;hpb=53a77016babf2e6ddce0035a906c9d44fd79811e;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index 866e52aa3..e482169df 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,16 +1,45 @@
+#serial 5
+
 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,
 [
+  headers='
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef 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_CHECK_FUNCS(DECL_FREE DECL_LSEEK DECL_MALLOC DECL_MEMCHR DECL_REALLOC \
-		   DECL_STPCPY DECL_STRSTR)
+    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.])
   fi
-  jm_CHECK_DECLARATIONS(free lseek malloc memchr realloc stpcpy strstr)
+
+  jm_CHECK_DECLARATIONS($headers, free lseek malloc \
+                        memchr realloc stpcpy strstr)
 ])