| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 |
- 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.in | 9 +++++++++
- 2 files changed, 19 insertions(+), 4 deletions(-)
- Index: Python-2.7.2/Makefile.pre.in
- ===================================================================
- --- Python-2.7.2.orig/Makefile.pre.in
- +++ Python-2.7.2/Makefile.pre.in
- @@ -856,7 +856,7 @@
- plat-mac/lib-scriptpackages/SystemEvents \
- plat-mac/lib-scriptpackages/Terminal
- PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
- -LIBSUBDIRS= lib-tk site-packages \
- +LIBSUBDIRS= site-packages \
- encodings compiler hotshot \
- email email/mime \
- json \
- @@ -870,8 +870,7 @@
- curses $(MACHDEPS)
-
- ifeq (@TEST_MODULES@,yes)
- -LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
- - lib-tk/test/test_ttk test test/data \
- +LIBSUBDIRS += test test/data \
- test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
- test/tracedmodules email/test email/test/data \
- json/tests sqlite3/test bsddb/test \
- @@ -899,6 +898,14 @@
- endif
- endif
-
- +ifeq (@TK@,yes)
- +LIBSUBDIRS += lib-tk
- +ifeq (@TEST_MODULES@,yes)
- +LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
- + lib-tk/test/test_ttk
- +endif
- +endif
- +
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- Index: Python-2.7.2/configure.in
- ===================================================================
- --- Python-2.7.2.orig/configure.in
- +++ Python-2.7.2/configure.in
- @@ -2416,6 +2416,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,
|
