Skip to content

Commit e74cd0f

Browse files
gh-115806: Make configure output more readable (#115807)
- make sure LDLIBRARY and HOSTRUNNER checks don't overlap - make the ipv6 library check less subtle
1 parent 2e92ffd commit e74cd0f

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

configure

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,11 +1415,13 @@ else # shared is disabled
14151415
;;
14161416
esac
14171417
fi
1418+
AC_MSG_RESULT([$LDLIBRARY])
14181419

14191420
if test "$cross_compiling" = yes; then
14201421
RUNSHARED=
14211422
fi
14221423

1424+
AC_MSG_CHECKING([HOSTRUNNER])
14231425
AC_ARG_VAR([HOSTRUNNER], [Program to run CPython for the host platform])
14241426
if test -z "$HOSTRUNNER"
14251427
then
@@ -1465,16 +1467,13 @@ then
14651467
)
14661468
fi
14671469
AC_SUBST([HOSTRUNNER])
1468-
AC_MSG_CHECKING([HOSTRUNNER])
14691470
AC_MSG_RESULT([$HOSTRUNNER])
14701471

14711472
if test -n "$HOSTRUNNER"; then
14721473
dnl Pass hostrunner variable as env var in order to expand shell expressions.
14731474
PYTHON_FOR_BUILD="_PYTHON_HOSTRUNNER='$HOSTRUNNER' $PYTHON_FOR_BUILD"
14741475
fi
14751476

1476-
AC_MSG_RESULT([$LDLIBRARY])
1477-
14781477
# LIBRARY_DEPS, LINK_PYTHON_OBJS and LINK_PYTHON_DEPS variable
14791478
AS_CASE([$ac_sys_system/$ac_sys_emscripten_target],
14801479
[Emscripten/browser*], [LIBRARY_DEPS='$(PY3LIBRARY) $(WASM_STDLIB) python.html python.worker.js'],
@@ -4522,12 +4521,13 @@ yes
45224521
fi
45234522

45244523
if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
4524+
AC_MSG_CHECKING([ipv6 library])
45254525
if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
45264526
LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
4527-
AC_MSG_NOTICE([using lib$ipv6lib])
4527+
AC_MSG_RESULT([lib$ipv6lib])
45284528
else
45294529
AS_VAR_IF([ipv6trylibc], [yes], [
4530-
AC_MSG_NOTICE([using libc])
4530+
AC_MSG_RESULT([libc])
45314531
], [
45324532
AC_MSG_ERROR([m4_normalize([
45334533
No $ipv6lib library found; cannot continue.

0 commit comments

Comments
 (0)