X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdecl.m4;h=bbe7593451b4a4b13fdbdb363bcf2b2342fd62f6;hb=5565f2f1ba4da0fbaf10406b8a0d38c1256ce0da;hp=65aed74ffc162ba3583c86eb9acf971fa4c1b2bd;hpb=d830e1ffac19244bea585e2a14845d0835322553;p=gnulib.git

diff --git a/m4/decl.m4 b/m4/decl.m4
index 65aed74ff..bbe759345 100644
--- a/m4/decl.m4
+++ b/m4/decl.m4
@@ -1,41 +1,46 @@
 AC_DEFUN(jm_CHECK_DECLARATION,
 [
-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,
-[AC_TRY_COMPILE([
+  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_unistd_h" && AC_CHECK_HEADERS(unistd.h)
+  AC_MSG_CHECKING([whether $1 is declared])
+  AC_CACHE_VAL(jm_cv_func_decl_$1,
+    [AC_TRY_COMPILE([
 #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
+#ifdef STDC_HEADERS
 # 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
@@ -46,9 +51,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_DECLARATION_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
       AC_DEFINE_UNQUOTED($jm_tr_func) $2], $3)dnl
   done
 ])