| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667 |
- From 570e1e81484d9bcbd30a7719b07d02785a5cab24 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>
- ---
- 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 b2a0490..974a052 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1043,7 +1043,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 \
- @@ -1061,7 +1060,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 \
- @@ -1084,6 +1082,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 270f337..e9e1897 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -2805,6 +2805,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.7.4
|
