| From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 |
| From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| Date: Wed, 22 Feb 2017 17:23:42 -0800 |
| Subject: [PATCH] Add an option to disable the tk module |
| |
| Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| Signed-off-by: Samuel Martin <s.martin49@gmail.com> |
| [ Andrey Smirnov: ported to Python 3.6 ] |
| Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> |
| --- |
| Makefile.pre.in | 11 ++++++++--- |
| configure.ac | 9 +++++++++ |
| 2 files changed, 17 insertions(+), 3 deletions(-) |
| |
| diff --git a/Makefile.pre.in b/Makefile.pre.in |
| index d826d8ac4b..dc84384680 100644 |
| --- a/Makefile.pre.in |
| +++ b/Makefile.pre.in |
| @@ -1390,7 +1390,7 @@ maninstall: altmaninstall |
| # Install the library |
| XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax |
| |
| -LIBSUBDIRS= tkinter site-packages \ |
| +LIBSUBDIRS= site-packages \ |
| asyncio \ |
| collections concurrent concurrent/futures encodings \ |
| email email/mime \ |
| @@ -1408,8 +1408,7 @@ LIBSUBDIRS= tkinter site-packages \ |
| curses \ |
| zoneinfo |
| |
| -TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ |
| - tkinter/test/test_ttk test \ |
| +TESTSUBDIRS= test \ |
| test/audiodata \ |
| test/capath test/data \ |
| test/cjkencodings test/decimaltestdata \ |
| @@ -1480,6 +1479,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ |
| test/test_tools test/test_warnings test/test_warnings/data \ |
| unittest/test unittest/test/testmock |
| |
| +ifeq (@TK@,yes) |
| +LIBSUBDIRS += tkinter |
| +TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ |
| + tkinter/test/test_ttk |
| +endif |
| + |
| ifeq (@LIB2TO3@,yes) |
| LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 |
| TESTSUBDIRS += lib2to3/tests \ |
| diff --git a/configure.ac b/configure.ac |
| index 8b5c65974c..4c72dae960 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -3338,6 +3338,15 @@ if test "$SQLITE3" = "no" ; then |
| DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" |
| fi |
| |
| +AC_SUBST(TK) |
| +AC_ARG_ENABLE(tk, |
| + AS_HELP_STRING([--disable-tk], [disable tk]), |
| + [ TK="${enableval}" ], [ TK=yes ]) |
| + |
| +if test "$TK" = "no"; then |
| + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" |
| +fi |
| + |
| AC_SUBST(PYDOC) |
| |
| AC_ARG_ENABLE(pydoc, |
| -- |
| 2.25.1 |
| |