Skip to content

Commit 0d35e3b

Browse files
authored
gh-54767: Respect --disable-loadable-sqlite-extensions in configure (GH-159728)
The option was enabled for every spelling, including =no and --disable-.
1 parent fdee11f commit 0d35e3b

3 files changed

Lines changed: 33 additions & 22 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The ``--enable-loadable-sqlite-extensions=no`` and
2+
``--disable-loadable-sqlite-extensions`` configure options now disable
3+
loadable SQLite extensions instead of enabling them.

‎configure‎

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4631,21 +4631,22 @@ AC_ARG_ENABLE([loadable-sqlite-extensions],
46314631
support loadable extensions in the sqlite3 module, see
46324632
Doc/library/sqlite3.rst (default is no)
46334633
]
4634-
), [
4635-
AS_VAR_IF([have_sqlite3_load_extension], [no], [
4636-
AC_MSG_RESULT([n/a])
4637-
AC_MSG_WARN([Your version of SQLite does not support loadable extensions])
4638-
], [
4639-
AC_MSG_RESULT([yes])
4640-
AC_DEFINE(
4641-
[PY_SQLITE_ENABLE_LOAD_EXTENSION], [1],
4642-
[Define to 1 to build the sqlite module with loadable extensions support.]
4643-
)
4644-
])
4645-
], [
4646-
AC_MSG_RESULT([no])
4647-
]
4634+
), [], [enable_loadable_sqlite_extensions=no]
46484635
)
4636+
AS_VAR_IF([enable_loadable_sqlite_extensions], [yes], [
4637+
AS_VAR_IF([have_sqlite3_load_extension], [no], [
4638+
AC_MSG_RESULT([n/a])
4639+
AC_MSG_WARN([Your version of SQLite does not support loadable extensions])
4640+
], [
4641+
AC_MSG_RESULT([yes])
4642+
AC_DEFINE(
4643+
[PY_SQLITE_ENABLE_LOAD_EXTENSION], [1],
4644+
[Define to 1 to build the sqlite module with loadable extensions support.]
4645+
)
4646+
])
4647+
], [
4648+
AC_MSG_RESULT([no])
4649+
])
46494650

46504651
dnl
46514652
dnl Detect Tcl/Tk. Use pkg-config if available.

0 commit comments

Comments
 (0)