Merge from coreutils.

[gnulib.git] / m4 / utime.m4

diff --git a/m4/utime.m4 b/m4/utime.m4
index 9767f94..6762a50 100644 (file)
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,15 +1,17 @@
-#serial 4
+#serial 6
 
 dnl From Jim Meyering
 dnl Replace the utime function on systems that need it.
 
 dnl FIXME
 
-AC_DEFUN([jm_FUNC_UTIME],
+AC_DEFUN([gl_FUNC_UTIME],
 [
   AC_REQUIRE([AC_FUNC_UTIME_NULL])
   if test $ac_cv_func_utime_null = no; then
     AC_LIBOBJ(utime)
+    AC_DEFINE(utime, rpl_utime,
+      [Define to rpl_utime if the replacement function should be used.])
     gl_PREREQ_UTIME
   fi
 ])
@@ -18,6 +20,6 @@ AC_DEFUN([jm_FUNC_UTIME],
 AC_DEFUN([gl_PREREQ_UTIME],
 [
   AC_CHECK_HEADERS_ONCE(utime.h)
-  AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
-  jm_FUNC_UTIMES_NULL
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
+  gl_FUNC_UTIMES_NULL
 ])