Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-31 04:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-115765: Don't use deprecated AC_EGREP_* macros in configure.ac (#116016)

Browse source 
Rewrite using AX_CHECK_DEFINE and AC_CHECK_TYPES.
This commit is contained in:
Erlend E. Aasland 2024-02-28 14:35:41 +01:00 • committed by GitHub
parent a71e32ce8e
commit 449c6da2bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 375 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

95
configure.ac
View file

@ -2895,15 +2895,11 @@ AC_CHECK_HEADERS(
#endif
])
# checks for typedefs
AC_CACHE_CHECK([for clock_t in time.h], [ac_cv_clock_t_time_h], [
AC_EGREP_HEADER([clock_t], [time.h], [ac_cv_clock_t_time_h=yes], [ac_cv_clock_t_time_h=no])
])
dnl checks for "no"
AS_VAR_IF([ac_cv_clock_t_time_h], [no], [
AC_DEFINE([clock_t], [long],
[Define to 'long' if <time.h> doesn't define.])
])
# Check for clock_t in time.h.
AC_CHECK_TYPES([clock_t], [],
[AC_DEFINE([clock_t], [long],
[Define to 'long' if <time.h> does not define clock_t.])],
[@%:@include <time.h>])
AC_CACHE_CHECK([for makedev], [ac_cv_func_makedev], [
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@ -4331,13 +4327,9 @@ else
# define _POSIX_THREADS in unistd.h. Some apparently don't
# (e.g. gnu pth with pthread emulation)
AC_MSG_CHECKING([for _POSIX_THREADS in unistd.h])
AC_EGREP_CPP([yes],
[
#include <unistd.h>
#ifdef _POSIX_THREADS
yes
#endif
], unistd_defines_pthreads=yes, unistd_defines_pthreads=no)
AX_CHECK_DEFINE([unistd.h], [_POSIX_THREADS],
[unistd_defines_pthreads=yes],
[unistd_defines_pthreads=no])
AC_MSG_RESULT([$unistd_defines_pthreads])
AC_DEFINE([_REENTRANT])
@ -4517,34 +4509,21 @@ if test "$ipv6" = yes -a "$cross_compiling" = no; then
case $i in
inria)
dnl http://www.kame.net/
AC_EGREP_CPP([yes], [
#include <netinet/in.h>
#ifdef IPV6_INRIA_VERSION
yes
@%:@endif],
[ipv6type=$i])
AX_CHECK_DEFINE([netinet/in.h], [IPV6_INRIA_VERSION], [ipv6type=$i])
;;
kame)
dnl http://www.kame.net/
AC_EGREP_CPP([yes], [
#include <netinet/in.h>
#ifdef __KAME__
yes
@%:@endif],
[ipv6type=$i;
ipv6lib=inet6
ipv6libdir=/usr/local/v6/lib
ipv6trylibc=yes])
AX_CHECK_DEFINE([netinet/in.h], [__KAME__],
[ipv6type=$i
ipv6lib=inet6
ipv6libdir=/usr/local/v6/lib
ipv6trylibc=yes])
;;
linux-glibc)
dnl http://www.v6.linux.or.jp/
AC_EGREP_CPP([yes], [
#include <features.h>
#if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2))
yes
@%:@endif],
[ipv6type=$i;
ipv6trylibc=yes])
dnl Advanced IPv6 support was added to glibc 2.1 in 1999.
AX_CHECK_DEFINE([features.h], [__GLIBC__],
[ipv6type=$i
ipv6trylibc=yes])
;;
linux-inet6)
dnl http://www.v6.linux.or.jp/
@ -4564,35 +4543,23 @@ yes
fi
;;
toshiba)
AC_EGREP_CPP([yes], [
#include <sys/param.h>
#ifdef _TOSHIBA_INET6
yes
@%:@endif],
[ipv6type=$i;
ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib])
AX_CHECK_DEFINE([sys/param.h], [_TOSHIBA_INET6],
[ipv6type=$i
ipv6lib=inet6
ipv6libdir=/usr/local/v6/lib])
;;
v6d)
AC_EGREP_CPP([yes], [
#include </usr/local/v6/include/sys/v6config.h>
#ifdef __V6D__
yes
@%:@endif],
[ipv6type=$i;
ipv6lib=v6;
ipv6libdir=/usr/local/v6/lib;
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"])
AX_CHECK_DEFINE([/usr/local/v6/include/sys/v6config.h], [__V6D__],
[ipv6type=$i
ipv6lib=v6
ipv6libdir=/usr/local/v6/lib
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"])
;;
zeta)
AC_EGREP_CPP([yes], [
#include <sys/param.h>
#ifdef _ZETA_MINAMI_INET6
yes
@%:@endif],
[ipv6type=$i;
ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib])
AX_CHECK_DEFINE([sys/param.h], [_ZETA_MINAMI_INET6],
[ipv6type=$i
ipv6lib=inet6
ipv6libdir=/usr/local/v6/lib])
;;
esac
if test "$ipv6type" != "unknown"; then