From 5e01a74512429b01c3ce25e819ef69415d24f43b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 Jan 2014 06:39:41 +0800 Subject: [PATCH 05/12] Add option to disable the sqlite3 module Signed-off-by: Thomas Petazzoni Signed-off-by: Samuel Martin --- Makefile.pre.in | 8 ++++++-- configure.ac | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 1f96b0a..560a997 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1125,7 +1125,6 @@ LIBSUBDIRS= tkinter \ email email/mime \ ensurepip ensurepip/_bundled \ html json http dbm xmlrpc \ - sqlite3 \ logging csv wsgiref urllib \ ctypes ctypes/macholib \ idlelib idlelib/Icons \ @@ -1166,7 +1165,7 @@ TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ test/namespace_pkgs/project3/parent/child \ test/namespace_pkgs/module_and_namespace_package \ test/namespace_pkgs/module_and_namespace_package/a_test \ - sqlite3/test idlelib/idle_test \ + idlelib/idle_test \ test/test_importlib test/test_importlib/builtin \ test/test_importlib/extension test/test_importlib/frozen \ test/test_importlib/import_ test/test_importlib/source \ @@ -1185,6 +1184,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif +ifeq (@SQLITE3@,yes) +LIBSUBDIRS += sqlite3 +TESTSUBDIRS += sqlite3/test +endif + ifeq (@TEST_MODULES@,yes) LIBSUBDIRS += $(TESTSUBDIRS) endif diff --git a/configure.ac b/configure.ac index 83dfa94..5ddb0c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2637,6 +2637,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, -- 1.8.3.2