12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- From 3e51eef24c51b986c37b354f3de98218eb76909c Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Tue, 7 Mar 2017 22:29:06 +0100
- Subject: [PATCH] Add an option to disable the curses module
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Signed-off-by: Samuel Martin <s.martin49@gmail.com>
- [Peter: update for 2.7.16]
- Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
- ---
- Makefile.pre.in | 6 +++++-
- configure.ac | 9 +++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index 37ed70ab1d..458f4ad55b 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1060,7 +1060,7 @@ LIBSUBDIRS= site-packages \
- multiprocessing multiprocessing/dummy \
- unittest \
- lib-old \
- - curses $(MACHDEPS)
- + $(MACHDEPS)
-
- TESTSUBDIRS = test test/audiodata test/capath test/data \
- test/cjkencodings test/decimaltestdata test/xmltestdata \
- @@ -1103,6 +1103,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
- lib-tk/test/test_ttk
- endif
-
- +ifeq (@CURSES@,yes)
- +LIBSUBDIRS += curses
- +endif
- +
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- diff --git a/configure.ac b/configure.ac
- index 2c20f826c5..a7ebcd091e 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2852,6 +2852,15 @@ if test "$TK" = "no"; then
- DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
- fi
-
- +AC_SUBST(CURSES)
- +AC_ARG_ENABLE(curses,
- + AS_HELP_STRING([--disable-curses], [disable curses]),
- + [ CURSES="${enableval}" ], [ CURSES=yes ])
- +
- +if test "$CURSES" = "no"; then
- + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
- +fi
- +
- AC_SUBST(PYDOC)
-
- AC_ARG_ENABLE(pydoc,
- --
- 2.11.0
|