X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Futimbuf.m4;h=21724aafb573e6740c22d32d61718b7b9e7c1dc7;hb=ec3d798a1ac26da7acc1cfd0613315a0c3053922;hp=7af3d1470bf86c8dfaa517de4eb453ffd7789a42;hpb=74fcbe75cafec3ca219bb000e30f7aaddda69abb;p=gnulib.git

diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index 7af3d1470..21724aafb 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 5
 
 dnl From Jim Meyering
 
@@ -6,9 +6,9 @@ dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared --
 dnl usually in <utime.h>.
 dnl Some systems have utime.h but don't declare the struct anywhere.
 
-AC_DEFUN(jm_STRUCT_UTIMBUF,
+AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
 [
-  AC_CHECK_HEADERS(utime.h)
+  AC_CHECK_HEADERS_ONCE(sys/time.h utime.h)
   AC_REQUIRE([AC_HEADER_TIME])
   AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf,
     [AC_TRY_COMPILE(
@@ -33,17 +33,8 @@ AC_DEFUN(jm_STRUCT_UTIMBUF,
     ])
 
   if test $fu_cv_sys_struct_utimbuf = 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(STRUCT_UTIMBUF)
-    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_STRUCT_UTIMBUF
-    AC_DEFINE_UNQUOTED($ac_kludge)
+    AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1,
+      [Define if struct utimbuf is declared -- usually in <utime.h>.
+       Some systems have utime.h but don't declare the struct anywhere. ])
   fi
 ])