From: Bruno Haible Date: Fri, 14 Aug 2020 22:14:14 +0000 (+0200) Subject: utime-h: Generate an utime.h file always. X-Git-Tag: v1.0~3766 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=3fa8acc90ad1662bd0b59e71bb84c9d2dc72a17a;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 23e7442d9e..1810d56f3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-08-14 Bruno Haible + + 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 mktime, mktime-internal: Remove obsolete code. diff --git a/m4/utime_h.m4 b/m4/utime_h.m4 index 2a73636f51..6b5dfc5442 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 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 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 diff --git a/modules/utime-h b/modules/utime-h index 5cd5317c7d..fb1f1ba389 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 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: