X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Futimes.m4;h=f7e7842c5a0cae8c1a6250b6b91033a69aa788b7;hb=1bb8cb70f5271120ecc1f88dd58fb5b79b84353d;hp=eceb7ac6d9466c5de00bda5ed5ec5b80679a8cff;hpb=b9be3ea72565fb691bf74e1da2be9a841dd0820b;p=gnulib.git

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index eceb7ac6d..f7e7842c5 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,37 +1,32 @@
-#serial 2
+#serial 4
 
-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_DEFUN([jm_FUNC_UTIMES_NULL],
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
-[rm -f conftestdata; > conftestdata
+[rm -f conftest.data; > conftest.data
 AC_TRY_RUN([
-/* In case stat has been redefined to rpl_stat, undef it here.  */
+/* 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,
+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)
 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(HAVE_UTIMES_NULL, 1,
+		[Define if utimes accepts a null argument])
     fi
   ]
 )