Use the new 3-arg form of AC_DEFINE instead of my gross kludge.

[gnulib.git] / m4 / utimes.m4

diff --git a/m4/utimes.m4 b/m4/utimes.m4
index ce9f86b..f91e688 100644 (file)
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,6 +1,7 @@
-#serial 2
+#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,
@@ -22,18 +23,8 @@ exit(!(stat ("conftestdata", &s) == 0 && utimes("conftestdata", (long *)0) == 0
 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
   ]
 )