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 f5fb821c29a33cfc13327a8e6866e5f60d7bd033..dbb95e34d3fdc10fc9a3ec312c31ce5db83cc8f9 100644 (file)
--- 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 f078f2cf09ba0e58143a98b53ec1b7b25d677b21..4f83fed2659bbcd7e4555f35f2502b43d5198820 100644 (file)
--- 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 8e18312449edb4a6b7942cc982913a508e3ae976..0ccb20c4e8c4506d5725990a7e059f2d9ef87730 100644 (file)
--- 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 709b657c9da773f7fe74601edf476a3e15ca1516..371c6cc480ad05ed251569b146f556bd898ae1f1 100644 (file)
--- 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 d82ca810cc2bec245578f30023de959dcfbae3df..712b7491be623474eaab12bed5f8f6915a316d5f 100644 (file)
--- 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 758621c4b68f45a8faa187ee052ad8a899afd5fd..498fd4c5d2c3e2bd3af36ede5bac82e3b29a8a0c 100644 (file)
--- 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