| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566 |
- 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 | 14 +++++++++++---
- configure.ac | 9 +++++++++
- 2 files changed, 20 insertions(+), 3 deletions(-)
- Index: b/Makefile.pre.in
- ===================================================================
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1139,7 +1139,7 @@
- EXTRAPLATDIR= @EXTRAPLATDIR@
- MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
- XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
- -LIBSUBDIRS= tkinter \
- +LIBSUBDIRS= \
- site-packages \
- asyncio \
- collections concurrent concurrent/futures encodings \
- @@ -1157,8 +1157,7 @@
- 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 \
- @@ -1212,6 +1211,12 @@
- 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
- Index: b/configure.ac
- ===================================================================
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2681,6 +2681,15 @@
- 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,
|
