Skip to content

bpo-45847: Port _tkinter to PY_STDLIB_MOD #31698

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
miss-islington merged 20 commits into from
Mar 31, 2022
Merged

bpo-45847: Port _tkinter to PY_STDLIB_MOD #31698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0aee55a
Remove obsolete HAVE_UCS4_TCL check
Nov 26, 2021
8c8b74d
bpo-45847: Port _tkinter to PY_STDLIB_MOD
Nov 27, 2021
da79509
Remove dead lines from Setup.stdlib.in
Mar 6, 2022
1533c54
Update What's New
Mar 6, 2022
a8313a1
Use LIBS iso. LDFLAGS when compiling conftest
Mar 7, 2022
f835d6d
Remove references to --with-tclk-* from Doc
Mar 7, 2022
72cf592
Add special-case for FreeBSD
Mar 7, 2022
ff95879
Merge remote-tracking branch 'upstream/main' into ac-tkinter
Mar 7, 2022
ea426ef
Regen configure bco. GH-31700
Mar 7, 2022
27f2dd1
Merge branch 'main' into ac-tkinter
Mar 7, 2022
5816799
Don't break configure if x11 is not found
Mar 8, 2022
4c435ec
Reduce configure noise
Mar 14, 2022
80615d2
Merge branch 'main' into ac-tkinter
Mar 14, 2022
aa083a5
Fix PKG_CHECK_EXISTS
Mar 14, 2022
789dc24
Remove obsoleted functions from setup.py
Mar 14, 2022
5e9887d
Merge branch 'main' into ac-tkinter
Mar 17, 2022
b8ee798
make patchcheck
Mar 17, 2022
0cf682f
Merge remote-tracking branch main into ac-tkinter
Mar 17, 2022
1574c1b
Merge remote-tracking branch 'upstream/main' into ac-tkinter
Mar 30, 2022
b48d671
Address review: document the removal of the configure options
Mar 30, 2022
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
Reduce configure noise 
PKG_CHECK_EXISTS does not print any output, so we can run the pk-config
query loop quietly until we get a hit; then we'll run PKG_CHECK_MODULES
to fetch the needed compiler and linker options.
  • Loading branch information
Erlend E. Aasland committed Mar 14, 2022
commit 4c435ec00545ca45a941cd2aace8641e4dbfb4e0
17 changes: 16 additions & 1 deletion configure
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3502,6 +3502,7 @@ AS_VAR_IF([enable_loadable_sqlite_extensions], [yes], [
dnl
dnl Detect Tcl/Tk. Use pkg-config if available.
dnl
found_tcltk=no
for _QUERY in \
"tcl >= 8.4.2 tk >= 8.4.2" \
"tcl8.6 tk8.6" \
Expand All @@ -3511,7 +3512,10 @@ for _QUERY in \
"tcl8.4 >= 8.4.2 tk8.4 >= 8.4.2" \
"tcl84 >= 8.4.2 tk84 >= 8.4.2" \
; do
PKG_CHECK_MODULES([TCLTK], [$_QUERY], [break], [found_tcltk=no])
PKG_CHECK_EXISTS([PCLTK], [$_QUERY], [
PKG_CHECK_MODULES([TCLTK], [$_QUERY], [found_tcltk=yes], [found_tcltk=no])
])
AS_VAR_IF([found_tcltk], [yes], [break])
done

AS_VAR_IF([found_tcltk], [no], [
Expand Down