Skip to content

gh-115806: Improve configure output #115807

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
merged 7 commits into from
Feb 23, 2024
Merged

gh-115806: Improve configure output #115807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
03d1c08
Prevent 'checking for LDLIBRARY' and 'checking for HOSTRUNNER' from o…
erlend-aasland Feb 22, 2024
6ee0936
Improve ipv6 library check
erlend-aasland Feb 22, 2024
fb89294
Only print the ipv6 lib check if ipv6 is enabled
erlend-aasland Feb 22, 2024
92f1d33
Error if ipv6 library was not found
erlend-aasland Feb 22, 2024
c3dcccf
Pull in main
erlend-aasland Feb 22, 2024
4b3cd49
Quote it, because it is nicer
erlend-aasland Feb 22, 2024
abc1a01
Revert change in ipv6 lib error handling
erlend-aasland Feb 22, 2024
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
19 changes: 10 additions & 9 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,11 +1415,13 @@ else # shared is disabled
;;
esac
fi
AC_MSG_RESULT([$LDLIBRARY])

if test "$cross_compiling" = yes; then
RUNSHARED=
fi

AC_MSG_CHECKING([HOSTRUNNER])
AC_ARG_VAR([HOSTRUNNER], [Program to run CPython for the host platform])
if test -z "$HOSTRUNNER"
then
Expand Down Expand Up @@ -1465,16 +1467,13 @@ then
)
fi
AC_SUBST([HOSTRUNNER])
AC_MSG_CHECKING([HOSTRUNNER])
AC_MSG_RESULT([$HOSTRUNNER])

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

AC_MSG_RESULT([$LDLIBRARY])

# LIBRARY_DEPS, LINK_PYTHON_OBJS and LINK_PYTHON_DEPS variable
AS_CASE([$ac_sys_system/$ac_sys_emscripten_target],
[Emscripten/browser*], [LIBRARY_DEPS='$(PY3LIBRARY) $(WASM_STDLIB) python.html python.worker.js'],
Expand Down Expand Up @@ -4522,12 +4521,13 @@ yes
fi

if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
AC_MSG_CHECKING([ipv6 library])
if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
AC_MSG_NOTICE([using lib$ipv6lib])
AC_MSG_RESULT([lib$ipv6lib])
else
AS_VAR_IF([ipv6trylibc], [yes], [
AC_MSG_NOTICE([using libc])
AC_MSG_RESULT([libc])
], [
AC_MSG_ERROR([m4_normalize([
No $ipv6lib library found; cannot continue.
Expand Down