Skip to content

Commit e45604c

Browse files
author
Erlend E. Aasland
committed
Address review: remove checks
1 parent d5397d3 commit e45604c

File tree

2 files changed

+16
-46
lines changed

2 files changed

+16
-46
lines changed

configure

+15-42
Original file line numberDiff line numberDiff line change
@@ -698,8 +698,6 @@ MODULE_OSSAUDIODEV_FALSE
698698
MODULE_OSSAUDIODEV_TRUE
699699
MODULE_GRP_FALSE
700700
MODULE_GRP_TRUE
701-
MODULE__SOCKET_FALSE
702-
MODULE__SOCKET_TRUE
703701
MODULE_MMAP_FALSE
704702
MODULE_MMAP_TRUE
705703
MODULE_FCNTL_FALSE
@@ -722,6 +720,8 @@ MODULE__TYPING_FALSE
722720
MODULE__TYPING_TRUE
723721
MODULE__STRUCT_FALSE
724722
MODULE__STRUCT_TRUE
723+
MODULE__SOCKET_FALSE
724+
MODULE__SOCKET_TRUE
725725
MODULE_SELECT_FALSE
726726
MODULE_SELECT_TRUE
727727
MODULE__RANDOM_FALSE
@@ -20575,6 +20575,15 @@ else
2057520575
fi
2057620576
as_fn_append MODULE_BLOCK "MODULE_SELECT=yes$as_nl"
2057720577

20578+
if true; then
20579+
MODULE__SOCKET_TRUE=
20580+
MODULE__SOCKET_FALSE='#'
20581+
else
20582+
MODULE__SOCKET_TRUE='#'
20583+
MODULE__SOCKET_FALSE=
20584+
fi
20585+
as_fn_append MODULE_BLOCK "MODULE__SOCKET=yes$as_nl"
20586+
2057820587
if true; then
2057920588
MODULE__STRUCT_TRUE=
2058020589
MODULE__STRUCT_FALSE='#'
@@ -20741,42 +20750,6 @@ fi
2074120750
$as_echo "$py_cv_module_mmap" >&6; }
2074220751

2074320752

20744-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _socket" >&5
20745-
$as_echo_n "checking for stdlib extension module _socket... " >&6; }
20746-
case $py_stdlib_not_available in #(
20747-
*_socket*) :
20748-
py_cv_module__socket=n/a ;; #(
20749-
*) :
20750-
if true; then :
20751-
if test "$ac_cv_header_sys_socket_h" = "yes" -a "$ac_cv_header_sys_types_h" = "yes" -a "$ac_cv_header_netinet_in_h" = "yes"; then :
20752-
py_cv_module__socket=yes
20753-
else
20754-
py_cv_module__socket=missing
20755-
fi
20756-
else
20757-
py_cv_module__socket=disabled
20758-
fi
20759-
;;
20760-
esac
20761-
as_fn_append MODULE_BLOCK "MODULE__SOCKET=$py_cv_module__socket$as_nl"
20762-
if test "x$py_cv_module__socket" = xyes; then :
20763-
20764-
20765-
20766-
20767-
fi
20768-
if test "$py_cv_module__socket" = yes; then
20769-
MODULE__SOCKET_TRUE=
20770-
MODULE__SOCKET_FALSE='#'
20771-
else
20772-
MODULE__SOCKET_TRUE='#'
20773-
MODULE__SOCKET_FALSE=
20774-
fi
20775-
20776-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__socket" >&5
20777-
$as_echo "$py_cv_module__socket" >&6; }
20778-
20779-
2078020753

2078120754
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module grp" >&5
2078220755
$as_echo_n "checking for stdlib extension module grp... " >&6; }
@@ -22060,6 +22033,10 @@ if test -z "${MODULE_SELECT_TRUE}" && test -z "${MODULE_SELECT_FALSE}"; then
2206022033
as_fn_error $? "conditional \"MODULE_SELECT\" was never defined.
2206122034
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2206222035
fi
22036+
if test -z "${MODULE__SOCKET_TRUE}" && test -z "${MODULE__SOCKET_FALSE}"; then
22037+
as_fn_error $? "conditional \"MODULE__SOCKET\" was never defined.
22038+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
22039+
fi
2206322040
if test -z "${MODULE__STRUCT_TRUE}" && test -z "${MODULE__STRUCT_FALSE}"; then
2206422041
as_fn_error $? "conditional \"MODULE__STRUCT\" was never defined.
2206522042
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22104,10 +22081,6 @@ if test -z "${MODULE_MMAP_TRUE}" && test -z "${MODULE_MMAP_FALSE}"; then
2210422081
as_fn_error $? "conditional \"MODULE_MMAP\" was never defined.
2210522082
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2210622083
fi
22107-
if test -z "${MODULE__SOCKET_TRUE}" && test -z "${MODULE__SOCKET_FALSE}"; then
22108-
as_fn_error $? "conditional \"MODULE__SOCKET\" was never defined.
22109-
Usually this means the macro was only invoked conditionally." "$LINENO" 5
22110-
fi
2211122084
if test -z "${MODULE_GRP_TRUE}" && test -z "${MODULE_GRP_FALSE}"; then
2211222085
as_fn_error $? "conditional \"MODULE_GRP\" was never defined.
2211322086
Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

+1-4
Original file line numberDiff line numberDiff line change
@@ -6137,6 +6137,7 @@ PY_STDLIB_MOD_SIMPLE([_posixsubprocess])
61376137
PY_STDLIB_MOD_SIMPLE([_queue])
61386138
PY_STDLIB_MOD_SIMPLE([_random])
61396139
PY_STDLIB_MOD_SIMPLE([select])
6140+
PY_STDLIB_MOD_SIMPLE([_socket])
61406141
PY_STDLIB_MOD_SIMPLE([_struct])
61416142
PY_STDLIB_MOD_SIMPLE([_typing])
61426143
PY_STDLIB_MOD_SIMPLE([_xxsubinterpreters])
@@ -6157,10 +6158,6 @@ PY_STDLIB_MOD([fcntl],
61576158
[], [$FCNTL_LIBS])
61586159
PY_STDLIB_MOD([mmap],
61596160
[], [test "$ac_cv_header_sys_mman_h" = "yes" -a "$ac_cv_header_sys_stat_h" = "yes"])
6160-
PY_STDLIB_MOD([_socket],
6161-
[], m4_flatten([test "$ac_cv_header_sys_socket_h" = "yes"
6162-
-a "$ac_cv_header_sys_types_h" = "yes"
6163-
-a "$ac_cv_header_netinet_in_h" = "yes"]))
61646161

61656162
dnl platform specific extensions
61666163
PY_STDLIB_MOD([grp], [], [test "$ac_cv_func_getgrgid" = yes -o "$ac_cv_func_getgrgid_r" = yes])

0 commit comments

Comments
 (0)