Skip to content

bpo-45723: Improve and simplify more configure.ac checks (GH-29485) #29485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 6 commits into from
Nov 10, 2021
Merged

bpo-45723: Improve and simplify more configure.ac checks (GH-29485) #29485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e0fa90
Cache checking for -Wl,--no-as-needed
Nov 9, 2021
35fe25c
Make PY_CHECK_CC_WARNING more efficient
Nov 9, 2021
ad35861
Consolidate AC_MSG_CHECKING and AC_CACHE_VAL
Nov 9, 2021
77f4cad
Nitpick
Nov 9, 2021
de69f18
Use AS_VAR_APPEND in PY_CHECK_CC_WARNING
Nov 9, 2021
79b97e0
Take down one more AC_MSG_RESULT
Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Consolidate AC_MSG_CHECKING and AC_CACHE_VAL
  • Loading branch information
Erlend E. Aasland committed Nov 9, 2021
commit ad358611f6039d87225ee7951e94b11f4069bdfd
90 changes: 24 additions & 66 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5692,7 +5692,6 @@ rm -f core conftest.err conftest.$ac_objext \
LDFLAGS="$save_LDFLAGS"

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_no_as_needed" >&5
$as_echo "$ac_cv_wl_no_as_needed" >&6; }

Expand Down Expand Up @@ -7115,8 +7114,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_extra_warning" >&5
$as_echo "$ac_cv_enable_extra_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_extra_warning" >&5
$as_echo "$ac_cv_enable_extra_warning" >&6; }


if test "x$ac_cv_enable_extra_warning" = xyes; then :
Expand All @@ -7127,12 +7124,12 @@ fi
# GCC produce warnings for legal Python code. Enable
# -fno-strict-aliasing on versions of GCC that support but produce
# warnings. See Issue3326
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5
$as_echo_n "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; }
ac_save_cc="$CC"
CC="$CC -fno-strict-aliasing"
save_CFLAGS="$CFLAGS"
if ${ac_cv_no_strict_aliasing+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5
$as_echo_n "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; }
if ${ac_cv_no_strict_aliasing+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Expand Down Expand Up @@ -7183,11 +7180,10 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5
$as_echo "$ac_cv_no_strict_aliasing" >&6; }
CFLAGS="$save_CFLAGS"
CC="$ac_save_cc"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5
$as_echo "$ac_cv_no_strict_aliasing" >&6; }
if test "x$ac_cv_no_strict_aliasing" = xyes; then :
BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"
fi
Expand Down Expand Up @@ -7228,8 +7224,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
$as_echo "$ac_cv_disable_unused_result_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
$as_echo "$ac_cv_disable_unused_result_warning" >&6; }

;; #(
Expand Down Expand Up @@ -7273,8 +7267,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5
$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5
$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; }


if test "x$ac_cv_disable_unused_parameter_warning" = xyes; then :
Expand Down Expand Up @@ -7313,8 +7305,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers_warning" >&5
$as_echo "$ac_cv_disable_missing_field_initializers_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers_warning" >&5
$as_echo "$ac_cv_disable_missing_field_initializers_warning" >&6; }


if test "x$ac_cv_disable_missing_field_initializers_warning" = xyes; then :
Expand Down Expand Up @@ -7353,8 +7343,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
$as_echo "$ac_cv_enable_sign_compare_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
$as_echo "$ac_cv_enable_sign_compare_warning" >&6; }


if test "x$ac_cv_enable_sign_compare_warning" = xyes; then :
Expand Down Expand Up @@ -7393,8 +7381,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }


# Don't enable unreachable code warning in debug mode, since it usually
Expand Down Expand Up @@ -7445,19 +7431,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }


if test "x$ac_cv_enable_strict_prototypes_warning" = xyes; then :
CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes"
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5
$as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; }
ac_save_cc="$CC"
CC="$CC -Werror=implicit-function-declaration"
if ${ac_cv_enable_implicit_function_declaration_error+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5
$as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; }
if ${ac_cv_enable_implicit_function_declaration_error+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Expand All @@ -7484,20 +7468,19 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

CC="$ac_save_cc"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5
$as_echo "$ac_cv_enable_implicit_function_declaration_error" >&6; }
CC="$ac_save_cc"

if test "x$ac_cv_enable_implicit_function_declaration_error" = xyes; then :
CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration"
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5
$as_echo_n "checking if we can use visibility in $CC... " >&6; }
ac_save_cc="$CC"
CC="$CC -fvisibility=hidden"
if ${ac_cv_enable_visibility+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5
$as_echo_n "checking if we can use visibility in $CC... " >&6; }
if ${ac_cv_enable_visibility+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Expand All @@ -7524,10 +7507,9 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

CC="$ac_save_cc"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5
$as_echo "$ac_cv_enable_visibility" >&6; }
CC="$ac_save_cc"

if test "x$ac_cv_enable_visibility" = xyes; then :
CFLAGS_NODIST="$CFLAGS_NODIST -fvisibility=hidden"
Expand Down Expand Up @@ -7790,7 +7772,6 @@ fi


fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_is_default" >&5
$as_echo "$ac_cv_pthread_is_default" >&6; }

Expand Down Expand Up @@ -7842,7 +7823,6 @@ fi

CC="$ac_save_cc"
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5
$as_echo "$ac_cv_kpthread" >&6; }
fi
Expand Down Expand Up @@ -7892,7 +7872,6 @@ fi

CC="$ac_save_cc"
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5
$as_echo "$ac_cv_kthread" >&6; }
fi
Expand Down Expand Up @@ -7942,7 +7921,6 @@ fi

CC="$ac_save_cc"
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5
$as_echo "$ac_cv_pthread" >&6; }
fi
Expand Down Expand Up @@ -10341,7 +10319,8 @@ fi


fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_aligned_required" >&5
$as_echo "$ac_cv_aligned_required" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_aligned_required" >&5
$as_echo "$ac_cv_aligned_required" >&6; }
if test "$ac_cv_aligned_required" = yes ; then
Expand Down Expand Up @@ -11237,7 +11216,7 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
$as_echo_n "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; }
if ${ac_cv_pthread_system_supported+:} false; then :
if ${ac_cv_pthread_system_supported+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
Expand Down Expand Up @@ -11271,8 +11250,7 @@ fi


fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_system_supported" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_system_supported" >&5
$as_echo "$ac_cv_pthread_system_supported" >&6; }
if test "$ac_cv_pthread_system_supported" = "yes"; then

Expand Down Expand Up @@ -13927,7 +13905,7 @@ if test "x$ac_cv_func_getaddrinfo" = xyes; then :

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5
$as_echo_n "checking getaddrinfo bug... " >&6; }
if ${ac_cv_buggy_getaddrinfo+:} false; then :
if ${ac_cv_buggy_getaddrinfo+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
Expand Down Expand Up @@ -14041,14 +14019,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
$as_echo "$ac_cv_buggy_getaddrinfo" >&6; }


fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5
$as_echo "$ac_cv_buggy_getaddrinfo" >&6; }

if test "$ac_cv_func_getaddrinfo" = no -o "$ac_cv_buggy_getaddrinfo" = yes
then
if test $ipv6 = yes
Expand Down Expand Up @@ -14311,7 +14287,6 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time_altzone" >&5
$as_echo "$ac_cv_header_time_altzone" >&6; }
if test $ac_cv_header_time_altzone = yes; then
Expand Down Expand Up @@ -14343,7 +14318,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_addrinfo" >&5
$as_echo "$ac_cv_struct_addrinfo" >&6; }
if test $ac_cv_struct_addrinfo = yes; then
Expand Down Expand Up @@ -14377,7 +14351,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_storage" >&5
$as_echo "$ac_cv_struct_sockaddr_storage" >&6; }
if test $ac_cv_struct_sockaddr_storage = yes; then
Expand Down Expand Up @@ -14412,7 +14385,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_alg" >&5
$as_echo "$ac_cv_struct_sockaddr_alg" >&6; }
if test $ac_cv_struct_sockaddr_alg = yes; then
Expand Down Expand Up @@ -15341,7 +15313,6 @@ fi


fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_posix_semaphores_enabled" >&5
$as_echo "$ac_cv_posix_semaphores_enabled" >&6; }
if test $ac_cv_posix_semaphores_enabled = no
Expand Down Expand Up @@ -15396,7 +15367,6 @@ fi


fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sem_getvalue" >&5
$as_echo "$ac_cv_broken_sem_getvalue" >&6; }
if test $ac_cv_broken_sem_getvalue = yes
Expand Down Expand Up @@ -15616,7 +15586,7 @@ then
# check whether wchar_t is signed or not
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5
$as_echo_n "checking whether wchar_t is signed... " >&6; }
if ${ac_cv_wchar_t_signed+:} false; then :
if ${ac_cv_wchar_t_signed+:} false; then :
$as_echo_n "(cached) " >&6
else

Expand Down Expand Up @@ -15644,8 +15614,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wchar_t_signed" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wchar_t_signed" >&5
$as_echo "$ac_cv_wchar_t_signed" >&6; }
fi

Expand Down Expand Up @@ -16059,7 +16028,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_rshift_extends_sign" >&5
$as_echo "$ac_cv_rshift_extends_sign" >&6; }
if test "$ac_cv_rshift_extends_sign" = no
Expand Down Expand Up @@ -16100,7 +16068,6 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getc_unlocked" >&5
$as_echo "$ac_cv_have_getc_unlocked" >&6; }
if test "$ac_cv_have_getc_unlocked" = yes
Expand Down Expand Up @@ -16510,7 +16477,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_nice" >&5
$as_echo "$ac_cv_broken_nice" >&6; }
if test "$ac_cv_broken_nice" = yes
Expand Down Expand Up @@ -16561,7 +16527,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_poll" >&5
$as_echo "$ac_cv_broken_poll" >&6; }
if test "$ac_cv_broken_poll" = yes
Expand Down Expand Up @@ -16658,7 +16623,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5
$as_echo "$ac_cv_working_tzset" >&6; }
if test "$ac_cv_working_tzset" = yes
Expand Down Expand Up @@ -16695,7 +16659,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec" >&5
$as_echo "$ac_cv_stat_tv_nsec" >&6; }
if test "$ac_cv_stat_tv_nsec" = yes
Expand Down Expand Up @@ -16732,7 +16695,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec2" >&5
$as_echo "$ac_cv_stat_tv_nsec2" >&6; }
if test "$ac_cv_stat_tv_nsec2" = yes
Expand Down Expand Up @@ -16808,7 +16770,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mvwdelch_is_expression" >&5
$as_echo "$ac_cv_mvwdelch_is_expression" >&6; }

Expand Down Expand Up @@ -16852,7 +16813,6 @@ else
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_window_has_flags" >&5
$as_echo "$ac_cv_window_has_flags" >&6; }

Expand Down Expand Up @@ -17497,7 +17457,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_mbstowcs" >&5
$as_echo "$ac_cv_broken_mbstowcs" >&6; }
if test "$ac_cv_broken_mbstowcs" = yes
Expand Down Expand Up @@ -17574,7 +17533,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
fi

fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_computed_gotos" >&5
$as_echo "$ac_cv_computed_gotos" >&6; }
case "$ac_cv_computed_gotos" in yes*)
Expand Down
Loading