X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Futime.m4;h=967faa253b7d59ceda9ff07f3fd30e9c21575492;hb=05552c43d21f272e927663aae4bc810e17d4d785;hp=34a0d1a1b9f0499d96fdd6b9af606b42542a9384;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/utime.m4 b/m4/utime.m4
index 34a0d1a1b..967faa253 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,18 +1,30 @@
-#serial 3
+#serial 7
 
 dnl From Jim Meyering
 dnl Replace the utime function on systems that need it.
 
+# Copyright (C) 1998, 2000, 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.
+
 dnl FIXME
 
-AC_DEFUN([jm_FUNC_UTIME],
+AC_DEFUN([gl_FUNC_UTIME],
 [
-  AC_CHECK_HEADERS(utime.h)
-  AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
   AC_REQUIRE([AC_FUNC_UTIME_NULL])
-
   if test $ac_cv_func_utime_null = no; then
-    jm_FUNC_UTIMES_NULL
-    AC_REPLACE_FUNCS(utime)
+    AC_LIBOBJ(utime)
+    AC_DEFINE(utime, rpl_utime,
+      [Define to rpl_utime if the replacement function should be used.])
+    gl_PREREQ_UTIME
   fi
 ])
+
+# Prerequisites of lib/utime.c.
+AC_DEFUN([gl_PREREQ_UTIME],
+[
+  AC_CHECK_HEADERS_ONCE(utime.h)
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
+  gl_FUNC_UTIMES_NULL
+])