X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Futimes.m4;h=f91e6885aa5aa35f75f1279f91f9cbede6c69bb2;hb=d2b42b931376d8d7a7f7e0735f1cc666529f6925;hp=ddb3aeaee47e98f33c6f38e3d18fdd556d8c89cf;hpb=c3bf1cd31fba6b06427f4fb2b339afa17077e5e9;p=gnulib.git

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index ddb3aeaee..f91e6885a 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,34 +1,30 @@
-#serial 1
+#serial 3
 
-dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL.
+dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL,
+dnl then do case-insensitive s/utime/utimes/.
 
 AC_DEFUN(jm_FUNC_UTIMES_NULL,
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
 [rm -f conftestdata; > conftestdata
-AC_TRY_RUN([#include <sys/types.h>
+AC_TRY_RUN([
+/* In case stat has been defined to rpl_stat, undef it here.  */
+#undef stat
+#include <sys/types.h>
 #include <sys/stat.h>
 main() {
 struct stat s, t;
 exit(!(stat ("conftestdata", &s) == 0 && utimes("conftestdata", (long *)0) == 0
 && stat("conftestdata", &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=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
-      if test x = y; then
-	# This code is deliberately never run via ./configure.
-	# FIXME: this is a hack to make autoheader put the corresponding
-	# HAVE_* undef for this symbol in config.h.in.  This saves me the
-	# trouble of having to maintain the #undef in acconfig.h manually.
-	AC_CHECK_FUNCS(UTIMES_NULL)
-      fi
-      # Defining it this way (rather than via AC_DEFINE) short-circuits the
-      # autoheader check -- autoheader doesn't know it's already been taken
-      # care of by the hack above.
-      ac_kludge=HAVE_UTIMES_NULL
-      AC_DEFINE_UNQUOTED($ac_kludge)
+      AC_DEFINE_UNQUOTED(HAVE_UTIMES_NULL, 1,
+			 [Define if utimes accepts a null argument])
     fi
   ]
 )