X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdecl.m4;h=781afa1b25545678bd79afa94cbba45650816b20;hb=f565b913ac0b2aeb6c8fb43c2026659896e9acaf;hp=bbe7593451b4a4b13fdbdb363bcf2b2342fd62f6;hpb=4439072511ee2e4dac0aa8fa5fb4f3c4c8f6f414;p=gnulib.git

diff --git a/m4/decl.m4 b/m4/decl.m4
index bbe759345..781afa1b2 100644
--- a/m4/decl.m4
+++ b/m4/decl.m4
@@ -1,9 +1,12 @@
+#serial 2
+
 AC_DEFUN(jm_CHECK_DECLARATION,
 [
   AC_REQUIRE([AC_HEADER_STDC])dnl
   test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h)
   test -z "$ac_cv_header_string_h" && AC_CHECK_HEADERS(string.h)
   test -z "$ac_cv_header_strings_h" && AC_CHECK_HEADERS(strings.h)
+  test -z "$ac_cv_header_stdlib_h" && AC_CHECK_HEADERS(stdlib.h)
   test -z "$ac_cv_header_unistd_h" && AC_CHECK_HEADERS(unistd.h)
   AC_MSG_CHECKING([whether $1 is declared])
   AC_CACHE_VAL(jm_cv_func_decl_$1,
@@ -19,7 +22,7 @@ AC_DEFUN(jm_CHECK_DECLARATION,
 #  include <strings.h>
 # endif
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 #ifdef HAVE_UNISTD_H
@@ -51,7 +54,7 @@ AC_DEFUN(jm_CHECK_DECLARATIONS,
   do
     jm_CHECK_DECLARATION($jm_func,
     [
-      jm_tr_func=HAVE_DECLARATION_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
+      jm_tr_func=HAVE_DECL_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
       AC_DEFINE_UNQUOTED($jm_tr_func) $2], $3)dnl
   done
 ])