X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Futimes-null.m4;h=91976f1dedde8d71a44ccbda6947349841238f11;hb=5390af1423eab9623205ddd259668ca123c07dd7;hp=927b877dd4c79f8c40680a7045b126f041bcb4d6;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4
index 927b877dd..91976f1de 100644
--- a/m4/utimes-null.m4
+++ b/m4/utimes-null.m4
@@ -1,6 +1,8 @@
-#serial 6
+# serial 9
+
+# Copyright (C) 1998-1999, 2001, 2003-2004, 2006, 2009 Free Software
+# Foundation, Inc.
 
-# Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,28 +11,30 @@ dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL,
 dnl then do case-insensitive s/utime/utimes/.
 
 AC_DEFUN([gl_FUNC_UTIMES_NULL],
-[AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
+[AC_CACHE_CHECK([whether utimes accepts a null argument], [ac_cv_func_utimes_null],
 [rm -f conftest.data; > conftest.data
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 /* In case stat has been defined to rpl_stat, undef it here.  */
 #undef stat
 #include <sys/types.h>
 #include <sys/stat.h>
-main() {
+#include <sys/time.h>
+int
+main () {
 struct stat s, t;
-exit(!(stat ("conftest.data", &s) == 0
-       && utimes("conftest.data", (long *)0) == 0
-       && stat("conftest.data", &t) == 0
-       && t.st_mtime >= s.st_mtime
-       && t.st_mtime - s.st_mtime < 120));
-}],
-  ac_cv_func_utimes_null=yes,
-  ac_cv_func_utimes_null=no,
-  ac_cv_func_utimes_null=no)
+return ! (stat ("conftest.data", &s) == 0
+	  && utimes ("conftest.data", 0) == 0
+	  && stat ("conftest.data", &t) == 0
+	  && t.st_mtime >= s.st_mtime
+	  && t.st_mtime - s.st_mtime < 120));
+}]])],
+  [ac_cv_func_utimes_null=yes],
+  [ac_cv_func_utimes_null=no],
+  [ac_cv_func_utimes_null=no])
 rm -f core core.* *.core])
 
     if test $ac_cv_func_utimes_null = yes; then
-      AC_DEFINE(HAVE_UTIMES_NULL, 1,
+      AC_DEFINE([HAVE_UTIMES_NULL], [1],
 		[Define if utimes accepts a null argument])
     fi
   ]