Skip to content

bpo-45774: Harden SQLite detection #30016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 5, 2022
Merged

bpo-45774: Harden SQLite detection #30016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8fdd805
bpo-45774: Harden SQLite detection
Dec 6, 2021
948a296
Address review: fix unintentional help text indentation
Dec 10, 2021
554d8be
Get rid of unintentional newlines in help text
Dec 10, 2021
f5b0552
Wrap long line
Dec 10, 2021
3326211
Merge branch 'main' into ac-harden-sqlite-detection
Feb 26, 2022
e8558da
Add NEWS item
Mar 4, 2022
686a5b2
Merge branch 'main' and regen configure
Mar 8, 2022
64b3d69
Merge branch 'main' into ac-harden-sqlite-detection
Apr 5, 2022
55f79a5
Address review: normalise tests
Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get rid of unintentional newlines in help text 
Reindent contents of AC_ARG_ENABLE
  • Loading branch information
Erlend E. Aasland committed Dec 10, 2021
commit 554d8bef59a4308a978ada1c7b51daf19a8438a2
15 changes: 7 additions & 8 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3374,25 +3374,25 @@ dnl hence CPPFLAGS instead of CFLAGS.

dnl 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 the sqlite3 module, see Doc/library/sqlite3.rst (default is no)]
),
], [
AS_VAR_IF([have_sqlite3_load_extension], [no], [
AC_MSG_RESULT([n/a])
AC_MSG_WARN([Your version of SQLite does not support loadable extensions])
AC_ARG_ENABLE([loadable-sqlite-extensions],
AS_HELP_STRING(
[--enable-loadable-sqlite-extensions],
[support loadable extensions in the sqlite3 module, see Doc/library/sqlite3.rst (default is no)]
), [
AS_VAR_IF([have_sqlite3_load_extension], [no], [
AC_MSG_RESULT([n/a])
AC_MSG_WARN([Your version of SQLite does not support loadable extensions])
], [
AC_MSG_RESULT([yes])
AC_DEFINE(
[PY_SQLITE_ENABLE_LOAD_EXTENSION], [1],
[Define to 1 to build the sqlite module with loadable extensions support.]
)
])
], [
AC_MSG_RESULT([yes])
AC_DEFINE(
[PY_SQLITE_ENABLE_LOAD_EXTENSION], [1],
[Define to 1 to build the sqlite module with loadable extensions support.]
)
])
], [
AC_MSG_RESULT([no])
])
AC_MSG_RESULT([no])
]
)

# Check for --with-tcltk-includes=path and --with-tcltk-libs=path
AC_SUBST(TCLTK_INCLUDES)
Expand Down