X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Ffutimens.m4;h=063db053962b1564f34b06528f8da2cfb4d41d74;hb=9b604b4cbfad7422bacc1c723df1d027b6a7c738;hp=68eaa781cac51afcd035f27a06d3d4ed6864be31;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/m4/futimens.m4 b/m4/futimens.m4
index 68eaa781c..063db0539 100644
--- a/m4/futimens.m4
+++ b/m4/futimens.m4
@@ -1,7 +1,7 @@
-# serial 3
+# serial 6
 # See if we need to provide futimens replacement.
 
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,6 @@ AC_DEFUN([gl_FUNC_FUTIMENS],
   AC_CHECK_FUNCS_ONCE([futimens])
   if test $ac_cv_func_futimens = no; then
     HAVE_FUTIMENS=0
-    AC_LIBOBJ([futimens])
   else
     AC_CACHE_CHECK([whether futimens works],
       [gl_cv_func_futimens_works],
@@ -23,18 +22,21 @@ AC_DEFUN([gl_FUNC_FUTIMENS],
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <errno.h>
 ]], [[struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } };
       int fd = creat ("conftest.file", 0600);
       struct stat st;
       if (fd < 0) return 1;
-      if (futimens (AT_FDCWD, NULL)) return 2;
-      if (futimens (fd, ts)) return 3;
+      errno = 0;
+      if (futimens (AT_FDCWD, NULL) == 0) return 2;
+      if (errno != EBADF) return 3;
+      if (futimens (fd, ts)) return 4;
       sleep (1);
       ts[0].tv_nsec = UTIME_NOW;
       ts[1].tv_nsec = UTIME_OMIT;
-      if (futimens (fd, ts)) return 4;
-      if (fstat (fd, &st)) return 5;
-      if (st.st_ctime < st.st_atime) return 6;
+      if (futimens (fd, ts)) return 5;
+      if (fstat (fd, &st)) return 6;
+      if (st.st_ctime < st.st_atime) return 7;
       ]])],
 dnl FIXME: simplify this in 2012, when file system bugs are no longer common
          [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -52,7 +54,6 @@ choke me
       rm -f conftest.file])
     if test "$gl_cv_func_futimens_works" != yes; then
       REPLACE_FUTIMENS=1
-      AC_LIBOBJ([futimens])
     fi
   fi
 ])