8 files changed, 16 insertions, 80 deletions
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index 580f7d60fa7..41b8891e43c 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-05  Karl Berry  <karl@freefriends.org>
+
+	* configure.ac (AC_HEADER_TIME): remove, since it will be
+	a no-op in the next autoconf anyway, and is (hopefully) universal.
+
 2020-06-16  Akira Kakuto  <kakuto@w32tex.org>
 
 	* detex.l, detex.c: Support old compilers.
diff --git a/Build/source/texk/detex/c-auto.in b/Build/source/texk/detex/c-auto.in
index 2b54aab655f..a2d410ec8a2 100644
--- a/Build/source/texk/detex/c-auto.in
+++ b/Build/source/texk/detex/c-auto.in
@@ -127,9 +127,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
 /* Version number of package */
 #undef VERSION
 
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index 1d0c8a6c2b1..0d3252224c1 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -13627,41 +13627,6 @@ fi
 rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
 
 ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
diff --git a/Build/source/texk/detex/configure.ac b/Build/source/texk/detex/configure.ac
index a544d2ccde9..42fc0a531a7 100644
--- a/Build/source/texk/detex/configure.ac
+++ b/Build/source/texk/detex/configure.ac
@@ -1,6 +1,8 @@
+dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright 2014-2020 Karl Berry <tex-live@tug.org>
+dnl   Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -17,7 +19,6 @@ dnl Common code for all programs using libkpathsea.
 KPSE_COMMON([detex])
 
 AC_PROG_LEX
-AC_HEADER_TIME
 
 AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
 
diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog
index 44dd00c22e3..8369e5aa0a9 100644
--- a/Build/source/texk/gsftopk/ChangeLog
+++ b/Build/source/texk/gsftopk/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-05  Karl Berry  <karl@freefriends.org>
+
+	* configure.ac (AC_HEADER_TIME): remove, since it will be
+	a no-op in the next autoconf anyway, and is (hopefully) universal.
+
 2019-08-18  Akira Kakuto  <kakuto@w32tex.org>
 
 	* gsftopk.c: Add an option -dNOSAFER for Ghostscript.
diff --git a/Build/source/texk/gsftopk/c-auto.in b/Build/source/texk/gsftopk/c-auto.in
index 33bad58b980..544fa7d0d43 100644
--- a/Build/source/texk/gsftopk/c-auto.in
+++ b/Build/source/texk/gsftopk/c-auto.in
@@ -166,9 +166,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
 /* Version number of package */
 #undef VERSION
 
diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure
index c8d8be26fe3..3c7756c294b 100755
--- a/Build/source/texk/gsftopk/configure
+++ b/Build/source/texk/gsftopk/configure
@@ -13508,41 +13508,6 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
 for ac_header in poll.h sys/time.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/Build/source/texk/gsftopk/configure.ac b/Build/source/texk/gsftopk/configure.ac
index e8e8d3f9593..bae69f16fd5 100644
--- a/Build/source/texk/gsftopk/configure.ac
+++ b/Build/source/texk/gsftopk/configure.ac
@@ -1,6 +1,8 @@
+dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009, 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright 2014-2020 Karl Berry <tex-live@tug.org>
+dnl   Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -19,7 +21,6 @@ AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
 
 dnl Checks for header files.
 AC_HEADER_SYS_WAIT
-AC_HEADER_TIME
 AC_CHECK_HEADERS([poll.h sys/time.h])
 
 dnl Checks for library functions.