X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsys_stat_h.m4;h=9ca13116b10585dd8fcc737c9b37ecce738c0d2f;hb=f6183e64302b3af947cdd932049180b5a32f6443;hp=8131477d31feaf7b87e6690893d3f379d6e13d4d;hpb=91182f188f4d5d51f37a9f390aa210bef0ab6898;p=gnulib.git

diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
index 8131477d3..9ca13116b 100644
--- a/m4/sys_stat_h.m4
+++ b/m4/sys_stat_h.m4
@@ -1,4 +1,4 @@
-# sys_stat_h.m4 serial 2   -*- Autoconf -*-
+# sys_stat_h.m4 serial 4   -*- Autoconf -*-
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,16 +15,18 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H],
 
   dnl Check for mkdir.  Mingw has _mkdir(name) in the nonstandard <io.h>
   dnl instead.
-  AC_CHECK_DECLS([mkdir], [], [], [#include <sys/stat.h>])
+  AC_CHECK_DECLS([mkdir],
+    [],
+    [AC_CHECK_HEADERS([io.h])],
+    [#include <sys/stat.h>])
+  AC_REQUIRE([AC_C_INLINE])
 
-  SYS_STAT_H=
-  if test $ac_cv_func_lstat:$ac_cv_have_decl_mkdir != yes:yes ; then
-    gl_ABSOLUTE_HEADER([sys/stat.h])
-    ABSOLUTE_SYS_STAT_H="<$gl_cv_absolute_sys_stat_h>"
-    AC_CHECK_HEADERS([io.h])
-    AC_REQUIRE([AC_C_INLINE])
-    AC_SUBST([ABSOLUTE_SYS_STAT_H])
-    SYS_STAT_H='sys/stat.h'
-  fi
+  dnl Check for broken stat macros.
+  AC_REQUIRE([AC_HEADER_STAT])
+
+  gl_ABSOLUTE_HEADER([sys/stat.h])
+  ABSOLUTE_SYS_STAT_H=\"$gl_cv_absolute_sys_stat_h\"
+  AC_SUBST([ABSOLUTE_SYS_STAT_H])
+  SYS_STAT_H='sys/stat.h'
   AC_SUBST([SYS_STAT_H])
 ]) # gl_HEADER_SYS_STAT_H