From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Mon, 9 Jan 2023 14:18:30 +0000 (-0500)
Subject: Update autotools and fix warnings (#1815)
X-Git-Tag: v3.7.0~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=013aef1275899bcee0b394402673a949c33c72db;p=thirdparty%2Flibarchive.git

Update autotools and fix warnings (#1815)

We do not need to check TIME_WITH_SYS_TIME anymore. We can check
HAVE_SYS_TIME_H and not bother checking for C99.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5fb821c2..dbb95e34d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1560,7 +1560,7 @@ ENDIF()
 #
 #
 CHECK_STRUCT_HAS_MEMBER("struct tm" tm_sec
-    "sys/types.h;sys/time.h;time.h" TIME_WITH_SYS_TIME)
+    "sys/types.h;sys/time.h;time.h" HAVE_SYS_TIME_H)
 
 #
 # Check for integer types
diff --git a/configure.ac b/configure.ac
index f078f2cf0..4f83fed26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
 m4_define([BSDCPIO_VERSION_S],LIBARCHIVE_VERSION_S())
 m4_define([BSDCAT_VERSION_S],LIBARCHIVE_VERSION_S())
 
-AC_PREREQ([2.69])
+AC_PREREQ([2.71])
 
 #
 # Now starts the "real" configure script.
@@ -105,7 +105,6 @@ AC_SUBST(PLATFORMCPPFLAGS)
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CC_C99
 AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_USE_SYSTEM_EXTENSIONS
@@ -657,7 +656,7 @@ AC_CHECK_TYPE([wchar_t],
 AX_COMPILE_CHECK_SIZEOF(int)
 AX_COMPILE_CHECK_SIZEOF(long)
 
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
diff --git a/contrib/android/config/android.h b/contrib/android/config/android.h
index 8e1831244..0ccb20c4e 100644
--- a/contrib/android/config/android.h
+++ b/contrib/android/config/android.h
@@ -180,5 +180,5 @@
 #define SIZEOF_WCHAR_T 4
 #define STDC_HEADERS 1
 #define STRERROR_R_CHAR_P 1
-#define TIME_WITH_SYS_TIME 1
+#define HAVE_SYS_TIME_H 1
 #endif
diff --git a/contrib/android/config/linux_host.h b/contrib/android/config/linux_host.h
index 709b657c9..371c6cc48 100644
--- a/contrib/android/config/linux_host.h
+++ b/contrib/android/config/linux_host.h
@@ -183,7 +183,7 @@
 #define SIZEOF_WCHAR_T 4
 #define STDC_HEADERS 1
 #define STRERROR_R_CHAR_P 1
-#define TIME_WITH_SYS_TIME 1
+#define HAVE_SYS_TIME_H 1
 #define _GNU_SOURCE 1
 
 #endif
diff --git a/contrib/android/config/windows_host.h b/contrib/android/config/windows_host.h
index d82ca810c..712b7491b 100644
--- a/contrib/android/config/windows_host.h
+++ b/contrib/android/config/windows_host.h
@@ -952,7 +952,7 @@
 /* #undef STRERROR_R_CHAR_P */
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
+#define HAVE_SYS_TIME_H 1
 
 
 
diff --git a/libarchive/config_freebsd.h b/libarchive/config_freebsd.h
index 758621c4b..498fd4c5d 100644
--- a/libarchive/config_freebsd.h
+++ b/libarchive/config_freebsd.h
@@ -234,7 +234,7 @@
 #define HAVE_WMEMCPY 1
 #define HAVE_WMEMMOVE 1
 #define HAVE_ZLIB_H 1
-#define TIME_WITH_SYS_TIME 1
+#define HAVE_SYS_TIME_H 1
 
 #if __FreeBSD_version >= 800505
 #define HAVE_LIBLZMA 1