123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869 |
- From 123ecc50932e3ad3f7a2d90d430b74822c9695d4 Mon Sep 17 00:00:00 2001
- From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Date: Tue, 7 Mar 2017 22:28:06 +0100
- Subject: [PATCH] Add option to disable the sqlite3 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 | 7 +++++--
- configure.ac | 9 +++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index 0e15b6d6f4..a2e5ac6d41 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1053,7 +1053,6 @@ LIBSUBDIRS= lib-tk site-packages \
- email email/mime \
- ensurepip ensurepip/_bundled \
- json \
- - sqlite3 \
- logging bsddb csv importlib wsgiref \
- ctypes ctypes/macholib \
- idlelib idlelib/Icons \
- @@ -1072,7 +1071,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- test/tracedmodules \
- email/test email/test/data \
- json/tests \
- - sqlite3/test \
- bsddb/test \
- ctypes/test \
- idlelib/idle_test \
- @@ -1095,6 +1093,11 @@ TESTSUBDIRS += lib2to3/tests \
- lib2to3/tests/data/fixers/myfixes
- endif
-
- +ifeq (@SQLITE3@,yes)
- +LIBSUBDIRS += sqlite3
- +TESTSUBDIRS += sqlite3/test
- +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 a2810ab8ed..4ee3c60501 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2834,6 +2834,15 @@ if test "$posix_threads" = "yes"; then
- AC_CHECK_FUNCS(pthread_atfork)
- fi
-
- +AC_SUBST(SQLITE3)
- +AC_ARG_ENABLE(sqlite3,
- + AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
- + [ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
- +
- +if test "$SQLITE3" = "no" ; then
- + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- +fi
- +
- AC_SUBST(PYDOC)
-
- AC_ARG_ENABLE(pydoc,
- --
- 2.11.0
|