>From 3fa8acc90ad1662bd0b59e71bb84c9d2dc72a17a Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 15 Aug 2020 00:14:14 +0200
Subject: [PATCH 1/5] utime-h: Generate an utime.h file always.

* modules/utime-h (Makefile.am): Generate utime.h always.
* m4/utime_h.m4 (gl_UTIME_H): Don't set UTIME_H. Don't define
GL_GENERATE_UTIME_H.
---
 ChangeLog       |  7 +++++++
 m4/utime_h.m4   | 24 +-----------------------
 modules/utime-h |  7 +------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23e7442..1810d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2020-08-14  Bruno Haible  <bruno@clisp.org>
 
+	utime-h: Generate an utime.h file always.
+	* modules/utime-h (Makefile.am): Generate utime.h always.
+	* m4/utime_h.m4 (gl_UTIME_H): Don't set UTIME_H. Don't define
+	GL_GENERATE_UTIME_H.
+
+2020-08-14  Bruno Haible  <bruno@clisp.org>
+
 	mktime, mktime-internal: Remove obsolete code.
 	* m4/mktime.m4 (gl_FUNC_MKTIME_WORKS): Don't #undef putenv.
 
diff --git a/m4/utime_h.m4 b/m4/utime_h.m4
index 2a73636..6b5dfc5 100644
--- a/m4/utime_h.m4
+++ b/m4/utime_h.m4
@@ -1,4 +1,4 @@
-# utime_h.m4 serial 3
+# utime_h.m4 serial 4
 dnl Copyright (C) 2017-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,28 +21,6 @@ AC_DEFUN([gl_UTIME_H],
   fi
   AC_SUBST([HAVE_UTIME_H])
 
-  m4_ifdef([gl_POSIXCHECK],
-    [UTIME_H=utime.h],
-    [UTIME_H=''
-     if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then
-       dnl Override <utime.h> always, to support the C++ GNULIB_NAMESPACE.
-       UTIME_H=utime.h
-     else
-       if test $ac_cv_header_utime_h != yes; then
-         dnl Provide a substitute <utime.h> file.
-         UTIME_H=utime.h
-       else
-         case "$host_os" in
-           mingw*) dnl Need special handling of 'struct utimbuf'.
-             UTIME_H=utime.h
-             ;;
-         esac
-       fi
-     fi
-    ])
-  AC_SUBST([UTIME_H])
-  AM_CONDITIONAL([GL_GENERATE_UTIME_H], [test -n "$UTIME_H"])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <utime.h>
diff --git a/modules/utime-h b/modules/utime-h
index 5cd5317..fb1f1ba 100644
--- a/modules/utime-h
+++ b/modules/utime-h
@@ -15,11 +15,10 @@ configure.ac:
 gl_UTIME_H
 
 Makefile.am:
-BUILT_SOURCES += $(UTIME_H)
+BUILT_SOURCES += utime.h
 
 # We need the following in order to create <utime.h> when the system
 # doesn't have one that works with the given compiler.
-if GL_GENERATE_UTIME_H
 utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -38,10 +37,6 @@ utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
 	      < $(srcdir)/utime.in.h; \
 	} > $@-t && \
 	mv $@-t $@
-else
-utime.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += utime.h utime.h-t
 
 Include:
-- 
2.7.4