Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-45774: Fix SQLite load extension autodetection (GH-29659)

This commit is contained in:
Erlend Egeberg Aasland 2021-11-20 15:02:52 +01:00 committed by GitHub
parent bc2bc0dbdb
commit 6d430ef5ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -11156,12 +11156,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
$as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
LIBS="-lsqlite3 $LIBS"
have_sqlite3_load_extension=yes
else
have_sqlite3_load_extension=no
fi

4
configure.ac
View File

@ -3196,7 +3196,9 @@ AC_CHECK_HEADER([sqlite3.h], [
], [])
], [have_supported_sqlite3=yes], [have_supported_sqlite3=no])
], [have_sqlite3=no])
AC_CHECK_LIB([sqlite3], [sqlite3_load_extension])
AC_CHECK_LIB([sqlite3], [sqlite3_load_extension],
[have_sqlite3_load_extension=yes],
[have_sqlite3_load_extension=no])
])
AS_VAR_COPY([CFLAGS], [save_CFLAGS])

3
pyconfig.h.in
View File

@ -634,9 +634,6 @@
/* Define to 1 if you have the `sendfile' library (-lsendfile). */
#undef HAVE_LIBSENDFILE
/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
#undef HAVE_LIBSQLITE3
/* Define to 1 if you have the <libutil.h> header file. */
#undef HAVE_LIBUTIL_H