X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcheck-decl.m4;h=e482169dfcf76291001bf7f921e69353a4c31ca1;hb=f1df5643e969a40ddeeaf350724ef5c03f8170a3;hp=e8bb16c88a76b3d9df90305f732a894ef5a0f395;hpb=7cf376feaf8a30a5823efabb2680e86b89bbd9c7;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index e8bb16c88..e482169df 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,4 +1,4 @@
-#serial 3
+#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
@@ -24,53 +24,22 @@ AC_DEFUN(jm_CHECK_DECLS,
 # 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)
-  fi
-  jm_CHECK_DECLARATIONS($headers, free lseek malloc \
-                        memchr realloc stpcpy strstr)
-
-  # Check for a declaration of localtime_r.
-  jm_CHECK_DECL_LOCALTIME_R
-])
 
-dnl localtime_r is a special case...
-dnl Code that uses the result of this test must use the same cpp
-dnl directives as are used below.  Also include the following declaration
-dnl after the inclusion of time.h.
-dnl
-dnl #if ! defined HAVE_DECL_LOCALTIME_R
-dnl extern struct tm* localtime_r ();
-dnl #endif
-AC_DEFUN(jm_CHECK_DECL_LOCALTIME_R,
-[
   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_LOCALTIME_R)
+    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
 
-  headers='
-/* Some systems need this in order to declare localtime_r properly.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <sys/types.h>
-#include <time.h>
-'
-  jm_CHECK_DECLARATIONS($headers, localtime_r)
+  jm_CHECK_DECLARATIONS($headers, free lseek malloc \
+                        memchr realloc stpcpy strstr)
 ])