[Python-checkins] bpo-45774: Fix SQLite load extension autodetection (GH-29659)
tiran
webhook-mailer at python.org
Sat Nov 20 09:03:00 EST 2021
https://github.com/python/cpython/commit/6d430ef5ab62158a200b94dff31b89524a9576bb
commit: 6d430ef5ab62158a200b94dff31b89524a9576bb
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: tiran <christian at python.org>
date: 2021-11-20T15:02:52+01:00
summary:
bpo-45774: Fix SQLite load extension autodetection (GH-29659)
files:
M configure
M configure.ac
M pyconfig.h.in
diff --git a/configure b/configure
index 9340cb072199c..dec3aa0586b83 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.ac b/configure.ac
index 924659713e474..f4adab19d6138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 0cc593fdfc569..b8f63955e3139 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -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
More information about the Python-checkins
mailing list