0021-Add-an-option-to-disable-the-tk-module.patch 1.93 KB
From d0d42570e5a23c3bf559e0413ec97729fd2f9e24 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 23 Dec 2015 11:49:14 +0100
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>
---
 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 c822dbd..0a93c27 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1170,7 +1170,7 @@ maninstall:	altmaninstall
 PLATDIR=	@PLATDIR@
 MACHDEPS=	$(PLATDIR)
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
-LIBSUBDIRS=	tkinter \
+LIBSUBDIRS=	\
 		site-packages \
 		asyncio \
 		collections concurrent concurrent/futures encodings \
@@ -1188,8 +1188,7 @@ LIBSUBDIRS=	tkinter \
 		venv venv/scripts venv/scripts/posix \
 		curses $(MACHDEPS)
 
-TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
-		test test/test_asyncio \
+TESTSUBDIRS = 	test test/test_asyncio \
 		test/test_email test/test_email/data \
 		test/test_json \
 		test/audiodata \
@@ -1248,6 +1247,12 @@ LIBSUBDIRS += sqlite3
 TESTSUBDIRS += sqlite3/test
 endif
 
+ifeq (@TK@,yes)
+LIBSUBDIRS += tkinter
+TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+	tkinter/test/test_ttk
+endif
+
 ifeq (@TEST_MODULES@,yes)
 LIBSUBDIRS += $(TESTSUBDIRS)
 endif
diff --git a/configure.ac b/configure.ac
index cae12ad..787b185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2903,6 +2903,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.6.4