[Python-checkins] gh-90005: Cleanup after GH-31698 (GH-91642)
miss-islington
webhook-mailer at python.org
Mon May 9 05:24:12 EDT 2022
https://github.com/python/cpython/commit/5e2e9c4e74643aecd87a88fdb12e15f4690acb04
commit: 5e2e9c4e74643aecd87a88fdb12e15f4690acb04
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-05-09T02:23:24-07:00
summary:
gh-90005: Cleanup after GH-31698 (GH-91642)
(cherry picked from commit 269e7267236256e269a3a6af7a4d4fea1c7439ea)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
files:
M configure
M configure.ac
diff --git a/configure b/configure
index b57c6f3a45abe..a4ef0e50902cb 100755
--- a/configure
+++ b/configure
@@ -654,10 +654,10 @@ MODULE_BINASCII_FALSE
MODULE_BINASCII_TRUE
MODULE_ZLIB_FALSE
MODULE_ZLIB_TRUE
-MODULE__TKINTER_FALSE
-MODULE__TKINTER_TRUE
MODULE__UUID_FALSE
MODULE__UUID_TRUE
+MODULE__TKINTER_FALSE
+MODULE__TKINTER_TRUE
MODULE__SQLITE3_FALSE
MODULE__SQLITE3_TRUE
MODULE_NIS_FALSE
@@ -24197,40 +24197,6 @@ fi
$as_echo "$py_cv_module__sqlite3" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _uuid" >&5
-$as_echo_n "checking for stdlib extension module _uuid... " >&6; }
- if test "$py_cv_module__uuid" != "n/a"; then :
-
- if true; then :
- if test "$have_uuid" = "yes"; then :
- py_cv_module__uuid=yes
-else
- py_cv_module__uuid=missing
-fi
-else
- py_cv_module__uuid=disabled
-fi
-
-fi
- as_fn_append MODULE_BLOCK "MODULE__UUID=$py_cv_module__uuid$as_nl"
- if test "x$py_cv_module__uuid" = xyes; then :
-
- as_fn_append MODULE_BLOCK "MODULE__UUID_CFLAGS=$LIBUUID_CFLAGS$as_nl"
- as_fn_append MODULE_BLOCK "MODULE__UUID_LDFLAGS=$LIBUUID_LIBS$as_nl"
-
-fi
- if test "$py_cv_module__uuid" = yes; then
- MODULE__UUID_TRUE=
- MODULE__UUID_FALSE='#'
-else
- MODULE__UUID_TRUE='#'
- MODULE__UUID_FALSE=
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__uuid" >&5
-$as_echo "$py_cv_module__uuid" >&6; }
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _tkinter" >&5
$as_echo_n "checking for stdlib extension module _tkinter... " >&6; }
if test "$py_cv_module__tkinter" != "n/a"; then :
@@ -24265,6 +24231,40 @@ fi
$as_echo "$py_cv_module__tkinter" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _uuid" >&5
+$as_echo_n "checking for stdlib extension module _uuid... " >&6; }
+ if test "$py_cv_module__uuid" != "n/a"; then :
+
+ if true; then :
+ if test "$have_uuid" = "yes"; then :
+ py_cv_module__uuid=yes
+else
+ py_cv_module__uuid=missing
+fi
+else
+ py_cv_module__uuid=disabled
+fi
+
+fi
+ as_fn_append MODULE_BLOCK "MODULE__UUID=$py_cv_module__uuid$as_nl"
+ if test "x$py_cv_module__uuid" = xyes; then :
+
+ as_fn_append MODULE_BLOCK "MODULE__UUID_CFLAGS=$LIBUUID_CFLAGS$as_nl"
+ as_fn_append MODULE_BLOCK "MODULE__UUID_LDFLAGS=$LIBUUID_LIBS$as_nl"
+
+fi
+ if test "$py_cv_module__uuid" = yes; then
+ MODULE__UUID_TRUE=
+ MODULE__UUID_FALSE='#'
+else
+ MODULE__UUID_TRUE='#'
+ MODULE__UUID_FALSE=
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__uuid" >&5
+$as_echo "$py_cv_module__uuid" >&6; }
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module zlib" >&5
$as_echo_n "checking for stdlib extension module zlib... " >&6; }
@@ -25121,14 +25121,14 @@ if test -z "${MODULE__SQLITE3_TRUE}" && test -z "${MODULE__SQLITE3_FALSE}"; then
as_fn_error $? "conditional \"MODULE__SQLITE3\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${MODULE__UUID_TRUE}" && test -z "${MODULE__UUID_FALSE}"; then
- as_fn_error $? "conditional \"MODULE__UUID\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${MODULE__TKINTER_TRUE}" && test -z "${MODULE__TKINTER_FALSE}"; then
as_fn_error $? "conditional \"MODULE__TKINTER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${MODULE__UUID_TRUE}" && test -z "${MODULE__UUID_FALSE}"; then
+ as_fn_error $? "conditional \"MODULE__UUID\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${MODULE_ZLIB_TRUE}" && test -z "${MODULE_ZLIB_FALSE}"; then
as_fn_error $? "conditional \"MODULE_ZLIB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 07b8885f1e482..c27d4ca3b569c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6869,12 +6869,12 @@ PY_STDLIB_MOD([_sqlite3],
[test "$have_sqlite3" = "yes"],
[test "$have_supported_sqlite3" = "yes"],
[$LIBSQLITE3_CFLAGS], [$LIBSQLITE3_LIBS])
-dnl PY_STDLIB_MOD([_tkinter], [], [], [], [])
+PY_STDLIB_MOD([_tkinter],
+ [], [test "$have_tcltk" = "yes"],
+ [$TCLTK_CFLAGS], [$TCLTK_LIBS])
PY_STDLIB_MOD([_uuid],
[], [test "$have_uuid" = "yes"],
[$LIBUUID_CFLAGS], [$LIBUUID_LIBS])
-PY_STDLIB_MOD([_tkinter], [],
- [test "$have_tcltk" = "yes"], [$TCLTK_CFLAGS], [$TCLTK_LIBS])
dnl compression libs
PY_STDLIB_MOD([zlib], [], [test "$have_zlib" = yes],
More information about the Python-checkins
mailing list