Import upstream version 1.26

[debian/tar] / m4 / d-ino.m4

diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 6e6dab3d23053bc0af0be91e4f7263217702e0f3..baf0dcc916b8ba4b05d167e65e33de73569daf0b 100644 (file)
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,11 +1,11 @@
-#serial 10
+# serial 12
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_ino.
 dnl
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2006, 2007 Free Software
+# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2011 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
@@ -14,27 +14,32 @@ dnl
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
   [AC_CACHE_CHECK([for d_ino member in directory struct],
-                 gl_cv_struct_dirent_d_ino,
+                  gl_cv_struct_dirent_d_ino,
      [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>
-            #include <sys/stat.h>
-            #include <dirent.h>
-          ]],
-          [[DIR *dp = opendir (".");
-            struct dirent *e;
-            struct stat st;
-            if (! dp)
-              return 1;
-            e = readdir (dp);
-            return ! (e
-                      && stat (e->d_name, &st) == 0
-                      && e->d_ino == st.st_ino);]])],
-           [gl_cv_struct_dirent_d_ino=yes],
-           [gl_cv_struct_dirent_d_ino=no],
-           [gl_cv_struct_dirent_d_ino=no])])
+        [AC_LANG_PROGRAM(
+           [[#include <sys/types.h>
+             #include <sys/stat.h>
+             #include <dirent.h>
+           ]],
+           [[DIR *dp = opendir (".");
+             struct dirent *e;
+             struct stat st;
+             if (! dp)
+               return 1;
+             e = readdir (dp);
+             if (! e)
+               return 2;
+             if (stat (e->d_name, &st) != 0)
+               return 3;
+             if (e->d_ino != st.st_ino)
+               return 4;
+             return 0;
+           ]])],
+           [gl_cv_struct_dirent_d_ino=yes],
+           [gl_cv_struct_dirent_d_ino=no],
+           [gl_cv_struct_dirent_d_ino=no])])
    if test $gl_cv_struct_dirent_d_ino = yes; then
-     AC_DEFINE(D_INO_IN_DIRENT, 1,
+     AC_DEFINE([D_INO_IN_DIRENT], [1],
        [Define if struct dirent has a member d_ino that actually works.])
    fi
   ]