X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdecl.m4;h=781afa1b25545678bd79afa94cbba45650816b20;hb=9a5d822871c98df9d2ac0883c322d661fc0651d2;hp=3af6a0cf3db8cfbe75f8ff9e00846287b746329a;hpb=7d5549f2b65e74c3448f82a7fad3db1abc56d1b6;p=gnulib.git

diff --git a/m4/decl.m4 b/m4/decl.m4
index 3af6a0cf3..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)
+  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,28 +22,28 @@ 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
 # include <unistd.h>
 #endif],
-[
+      [
 #ifndef $1
 char *(*pfn) = (char *(*)) $1
 #endif
-],
-  eval "jm_cv_func_decl_$1=yes",
-  eval "jm_cv_func_decl_$1=no")])
+      ],
+      eval "jm_cv_func_decl_$1=yes",
+      eval "jm_cv_func_decl_$1=no")])
 
-if eval "test \"`echo '$jm_cv_func_decl_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$2], , :, [$2])
-else
-  AC_MSG_RESULT(no)
-  ifelse([$3], , , [$3
+  if eval "test \"`echo '$jm_cv_func_decl_'$1`\" = yes"; then
+    AC_MSG_RESULT(yes)
+    ifelse([$2], , :, [$2])
+  else
+    AC_MSG_RESULT(no)
+    ifelse([$3], , , [$3
 ])dnl
-fi
+  fi
 ])dnl
 
 dnl jm_CHECK_DECLARATIONS(FUNCTION... [, ACTION-IF-DECLARED
@@ -51,9 +54,7 @@ AC_DEFUN(jm_CHECK_DECLARATIONS,
   do
     jm_CHECK_DECLARATION($jm_func,
     [
-      lower=abcdefghijklmnopqrstuvwxyz
-      upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-      jm_tr_func=HAVE_DECLARATION_`echo $jm_func | tr $lower $upper`
+      jm_tr_func=HAVE_DECL_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
       AC_DEFINE_UNQUOTED($jm_tr_func) $2], $3)dnl
   done
 ])