[Python-checkins] r86045 - in python/branches/py3k: Misc/NEWS configure configure.in setup.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Oct 31 18:11:02 2010
New Revision: 86045

Log:
add --enable-loadable-sqlite-extensions #10268

Modified:
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/configure
   python/branches/py3k/configure.in
   python/branches/py3k/setup.py

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Oct 31 18:11:02 2010
@@ -239,6 +239,8 @@
 Build
 -----
 
+- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure.
+
 - Issue #8852: Allow the socket module to build on OpenSolaris.
 
 - Drop -OPT:Olimit compiler option.

Modified: python/branches/py3k/configure
==============================================================================
--- python/branches/py3k/configure	(original)
+++ python/branches/py3k/configure	Sun Oct 31 18:11:02 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 85697 .
+# From configure.in Revision: 86042 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.2.
 #
@@ -739,6 +739,7 @@
 with_libs
 with_system_expat
 with_system_ffi
+enable_loadable_sqlite_extensions
 with_dbmliborder
 with_signal_module
 with_dec_threads
@@ -1381,6 +1382,8 @@
                           Build (MacOSX|Darwin) framework
   --enable-shared         disable/enable building shared python library
   --enable-profiling      enable C-level code profiling
+  --enable-loadable-sqlite-extensions
+                          support loadable extensions in _sqlite module
   --enable-ipv6           Enable ipv6 (with ipv4) support
   --disable-ipv6          Disable ipv6 support
   --enable-big-digits[=BITS]
@@ -8141,6 +8144,20 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_ffi" >&5
 $as_echo "$with_system_ffi" >&6; }
 
+# Check for support for loadable sqlite extensions
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-loadable-sqlite-extensions" >&5
+$as_echo_n "checking for --enable-loadable-sqlite-extensions... " >&6; }
+# Check whether --enable-loadable-sqlite-extensions was given.
+if test "${enable_loadable_sqlite_extensions+set}" = set; then :
+  enableval=$enable_loadable_sqlite_extensions;
+else
+  enable_loadable_sqlite_extensions="no"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_loadable_sqlite_extensions" >&5
+$as_echo "$enable_loadable_sqlite_extensions" >&6; }
+
 # Check for --with-dbmliborder
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dbmliborder" >&5
 $as_echo_n "checking for --with-dbmliborder... " >&6; }

Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in	(original)
+++ python/branches/py3k/configure.in	Sun Oct 31 18:11:02 2010
@@ -1956,6 +1956,15 @@
 
 AC_MSG_RESULT($with_system_ffi)
 
+# Check for support for loadable sqlite extensions
+AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
+AC_ARG_ENABLE(loadable-sqlite-extensions,
+              AS_HELP_STRING([--enable-loadable-sqlite-extensions], [support loadable extensions in _sqlite module]),
+              [],
+              [enable_loadable_sqlite_extensions="no"])
+
+AC_MSG_RESULT($enable_loadable_sqlite_extensions)
+
 # Check for --with-dbmliborder
 AC_MSG_CHECKING(for --with-dbmliborder)
 AC_ARG_WITH(dbmliborder,

Modified: python/branches/py3k/setup.py
==============================================================================
--- python/branches/py3k/setup.py	(original)
+++ python/branches/py3k/setup.py	Sun Oct 31 18:11:02 2010
@@ -997,8 +997,10 @@
             else:
                 sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
 
-            # Comment this out if you want the sqlite3 module to be able to load extensions.
-            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
+            # Enable support for loadable extensions in the sqlite3 module
+            # if --enable-loadable-sqlite-extensions configure option is used.
+            if '--enable-loadable-sqlite-extensions' not in sysconfig.get_config_var("CONFIG_ARGS"):
+                sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
 
             if sys.platform == 'darwin':
                 # In every directory on the search path search for a dynamic