From 7d9ed223fca5ce163b0de462b97fec33a9769518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Sat, 23 Jan 2021 19:28:52 +0100
Subject: [PATCH] Use gnulib's utime.h

* bootstrap.conf: Remove utime-h (included by utime).
* configure.ac: Remove header checks for utime.h and sys/utime.h.
* src/utils.c: Simply #include <utime.h>.
---
 bootstrap.conf | 1 -
 configure.ac   | 2 +-
 src/utils.c    | 9 +--------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 299262ad..63e78f90 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -118,7 +118,6 @@ libunistring-optional
 unistr/u8-strlen
 unicase/u8-tolower
 utime
-utime-h
 utimens
 vasprintf
 vsnprintf
diff --git a/configure.ac b/configure.ac
index df99cfd4..e74e65e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,7 +307,7 @@ dnl Checks for system header files that might be missing.
 dnl
 AC_HEADER_STDBOOL
 AC_CHECK_HEADERS(unistd.h sys/time.h)
-AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
+AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h)
 AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h dlfcn.h)
 
 AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
diff --git a/src/utils.c b/src/utils.c
index 4115ec53..426cda31 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -45,14 +45,7 @@ as that of the covered work.  */
 #include <stdarg.h>
 #include <locale.h>
 #include <errno.h>
-
-#if HAVE_UTIME
-# include <sys/types.h>
-# include <utime.h>
-# ifdef HAVE_SYS_UTIME_H
-#  include <sys/utime.h>
-# endif
-#endif
+#include <utime.h>
 
 #include <sys/time.h>