1*4882a593SmuzhiyunFrom ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Wed, 22 Feb 2017 17:23:42 -0800 4*4882a593SmuzhiyunSubject: [PATCH] Add an option to disable the tk module 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 7*4882a593SmuzhiyunSigned-off-by: Samuel Martin <s.martin49@gmail.com> 8*4882a593Smuzhiyun[ Andrey Smirnov: ported to Python 3.6 ] 9*4882a593SmuzhiyunSigned-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> 10*4882a593Smuzhiyun[ Adam Duskett: ported to Python 3.10.0 ] 11*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun Makefile.pre.in | 10 +++++++--- 14*4882a593Smuzhiyun configure.ac | 9 +++++++++ 15*4882a593Smuzhiyun 2 files changed, 16 insertions(+), 3 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/Makefile.pre.in b/Makefile.pre.in 18*4882a593Smuzhiyunindex 5628860..c968113 100644 19*4882a593Smuzhiyun--- a/Makefile.pre.in 20*4882a593Smuzhiyun+++ b/Makefile.pre.in 21*4882a593Smuzhiyun@@ -1446,7 +1446,6 @@ LIBSUBDIRS= asyncio \ 22*4882a593Smuzhiyun logging \ 23*4882a593Smuzhiyun multiprocessing multiprocessing/dummy \ 24*4882a593Smuzhiyun site-packages \ 25*4882a593Smuzhiyun- tkinter \ 26*4882a593Smuzhiyun turtledemo \ 27*4882a593Smuzhiyun unittest \ 28*4882a593Smuzhiyun urllib \ 29*4882a593Smuzhiyun@@ -1522,8 +1521,6 @@ TESTSUBDIRS= ctypes/test \ 30*4882a593Smuzhiyun test/tracedmodules \ 31*4882a593Smuzhiyun test/xmltestdata test/xmltestdata/c14n-20 \ 32*4882a593Smuzhiyun test/ziptestdata \ 33*4882a593Smuzhiyun- tkinter/test tkinter/test/test_tkinter \ 34*4882a593Smuzhiyun- tkinter/test/test_ttk \ 35*4882a593Smuzhiyun unittest/test unittest/test/testmock 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun ifeq (@PYDOC@,yes) 38*4882a593Smuzhiyun@@ -1543,6 +1540,13 @@ LIBSUBDIRS += sqlite3 39*4882a593Smuzhiyun TESTSUBDIRS += sqlite3/test 40*4882a593Smuzhiyun endif 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun+ifeq (@TK@,yes) 43*4882a593Smuzhiyun+LIBSUBDIRS += tkinter 44*4882a593Smuzhiyun+TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ 45*4882a593Smuzhiyun+ tkinter/test/test_ttk 46*4882a593Smuzhiyun+endif 47*4882a593Smuzhiyun+ 48*4882a593Smuzhiyun+ 49*4882a593Smuzhiyun TEST_MODULES=@TEST_MODULES@ 50*4882a593Smuzhiyun libinstall: build_all $(srcdir)/Modules/xxmodule.c 51*4882a593Smuzhiyun @for i in $(SCRIPTDIR) $(LIBDEST); \ 52*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 53*4882a593Smuzhiyunindex dfee472..dc76dff 100644 54*4882a593Smuzhiyun--- a/configure.ac 55*4882a593Smuzhiyun+++ b/configure.ac 56*4882a593Smuzhiyun@@ -3382,6 +3382,15 @@ if test "$SQLITE3" = "no" ; then 57*4882a593Smuzhiyun DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" 58*4882a593Smuzhiyun fi 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun+AC_SUBST(TK) 61*4882a593Smuzhiyun+AC_ARG_ENABLE(tk, 62*4882a593Smuzhiyun+ AS_HELP_STRING([--disable-tk], [disable tk]), 63*4882a593Smuzhiyun+ [ TK="${enableval}" ], [ TK=yes ]) 64*4882a593Smuzhiyun+ 65*4882a593Smuzhiyun+if test "$TK" = "no"; then 66*4882a593Smuzhiyun+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" 67*4882a593Smuzhiyun+fi 68*4882a593Smuzhiyun+ 69*4882a593Smuzhiyun AC_SUBST(PYDOC) 70*4882a593Smuzhiyun 71*4882a593Smuzhiyun AC_ARG_ENABLE(pydoc, 72*4882a593Smuzhiyun-- 73*4882a593Smuzhiyun2.30.2 74*4882a593Smuzhiyun 75