security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

build: Update for newer autoconf.

Browse Source 
* configure.ac (AC_PREREQ): Use >= 2.69.
(AC_CONFIG_HEADERS): Use it, instead of AC_CONFIG_HEADER.
(AC_HEADER_STDC, AC_HEADER_TIME): Remove obsolete macros.
(sys/time.h): Add the check of the header.
(time_t): Don't use TIME_WITH_SYS_TIME.
* acinclude.m4 (AC_HEADER_TIME): Don't require.
Don't use TIME_WITH_SYS_TIME.
* dirmngr/dns.c: Don't use TIME_WITH_SYS_TIME.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 6b4441a7de9d7090bb3b1570a12e1e8bce0554cb)
This commit is contained in:
NIIBE Yutaka 2021-12-22 10:36:26 +09:00 committed by Werner Koch
parent cdb053620a
commit 51dc05c308
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@ -329,18 +329,12 @@ fi
# #
AC_DEFUN([GNUPG_TIME_T_UNSIGNED], AC_DEFUN([GNUPG_TIME_T_UNSIGNED],
[ AC_CACHE_CHECK(whether time_t is unsigned, gnupg_cv_time_t_unsigned, [ AC_CACHE_CHECK(whether time_t is unsigned, gnupg_cv_time_t_unsigned,
[AC_REQUIRE([AC_HEADER_TIME])dnl [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY(
AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY(
[AC_INCLUDES_DEFAULT([]) [AC_INCLUDES_DEFAULT([])
#if TIME_WITH_SYS_TIME #if HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
# include <time.h>
#else #else
# if HAVE_SYS_TIME_H # include <time.h>
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif #endif
], ],
[((time_t)-1) < 0])], [((time_t)-1) < 0])],

23
configure.ac
View File

@ -19,8 +19,8 @@
# along with this program; if not, see <https://www.gnu.org/licenses/>. # along with this program; if not, see <https://www.gnu.org/licenses/>.
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61]) AC_PREREQ([2.69])
min_automake_version="1.14" min_automake_version="1.16.3"
# To build a release you need to create a tag with the version number # To build a release you need to create a tag with the version number
# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
@ -83,7 +83,7 @@ VERSION=$PACKAGE_VERSION
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([sm/gpgsm.c]) AC_CONFIG_SRCDIR([sm/gpgsm.c])
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AB_INIT AB_INIT
@ -1321,13 +1321,11 @@ fi
# Checks for header files. # Checks for header files.
# #
AC_MSG_NOTICE([checking for header files]) AC_MSG_NOTICE([checking for header files])
AC_HEADER_STDC AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h \
AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \ pwd.h inttypes.h signal.h sys/select.h sys/time.h \
pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h \ stdint.h signal.h termios.h \
stdint.h signal.h util.h libutil.h termios.h \
ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h]) ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h])
AC_HEADER_TIME
# #
@ -1375,15 +1373,10 @@ AC_CHECK_SIZEOF(unsigned long long)
AC_HEADER_TIME AC_HEADER_TIME
AC_CHECK_SIZEOF(time_t,,[[ AC_CHECK_SIZEOF(time_t,,[[
#include <stdio.h> #include <stdio.h>
#if TIME_WITH_SYS_TIME #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
# include <time.h>
#else #else
# if HAVE_SYS_TIME_H # include <time.h>
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif #endif
]]) ]])
GNUPG_TIME_T_UNSIGNED GNUPG_TIME_T_UNSIGNED

2
dirmngr/dns.c
View File

@ -56,7 +56,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
typedef SOCKET socket_fd_t; typedef SOCKET socket_fd_t;
#define STDCALL __stdcall #define STDCALL __stdcall
#ifdef TIME_WITH_SYS_TIME #ifdef HAVE_SYS_TIME_H
#include <sys/time.h> /* gettimeofday(2) */ #include <sys/time.h> /* gettimeofday(2) */
#endif #endif
#else #else

2
m4/tar-ustar.m4
View File

@ -10,7 +10,7 @@ dnl the same distribution terms as the rest of that program.
AC_DEFUN([GNUPG_CHECK_USTAR], AC_DEFUN([GNUPG_CHECK_USTAR],
[ [
AC_ARG_WITH(tar, AC_ARG_WITH(tar,
AC_HELP_STRING([--with-tar=PATH],[look for a tar program in PATH]), AS_HELP_STRING([--with-tar=PATH],[look for a tar program in PATH]),
[_do_tar=$withval]) [_do_tar=$withval])
if test x$_do_tar != xno ; then if test x$_do_tar != xno ; then