X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fcheck-decl.m4;h=d70e1c90f8dc393327200f7f90d884c89aa78951;hb=2183c2199b61a0738ff5712257ad503223669fe2;hp=b282bdebc7d7dfb50764b07767ec588779c6991b;hpb=f9b057c2ead6729425e8a0c8cbe42d11a14bb3c9;p=gnulib.git

diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index b282bdebc..d70e1c90f 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,27 +1,17 @@
-#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
@@ -77,7 +67,7 @@ AC_DEFUN(jm_CHECK_DECLS,
 
 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 \