From: Erlend Egeberg Aasland <erlend.aasland@innova.no>
Date: Sat, 20 Nov 2021 14:02:52 +0000 (+0100)
Subject: bpo-45774: Fix SQLite load extension autodetection (GH-29659)
X-Git-Tag: v3.11.0a3~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d430ef5ab62158a200b94dff31b89524a9576bb;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/configure b/configure
index 9340cb072199..dec3aa0586b8 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 924659713e47..f4adab19d613 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 0cc593fdfc56..b8f63955e313 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