Skip to content

Commit 6d430ef

Browse files
author
Erlend Egeberg Aasland
authored
bpo-45774: Fix SQLite load extension autodetection (GH-29659)
1 parent bc2bc0d commit 6d430ef

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

configure

+3-6
Original file line numberDiff line numberDiff line change
@@ -11156,12 +11156,9 @@ fi
1115611156
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
1115711157
$as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
1115811158
if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then :
11159-
cat >>confdefs.h <<_ACEOF
11160-
#define HAVE_LIBSQLITE3 1
11161-
_ACEOF
11162-
11163-
LIBS="-lsqlite3 $LIBS"
11164-
11159+
have_sqlite3_load_extension=yes
11160+
else
11161+
have_sqlite3_load_extension=no
1116511162
fi
1116611163

1116711164

configure.ac

+3-1
Original file line numberDiff line numberDiff line change
@@ -3196,7 +3196,9 @@ AC_CHECK_HEADER([sqlite3.h], [
31963196
], [])
31973197
], [have_supported_sqlite3=yes], [have_supported_sqlite3=no])
31983198
], [have_sqlite3=no])
3199-
AC_CHECK_LIB([sqlite3], [sqlite3_load_extension])
3199+
AC_CHECK_LIB([sqlite3], [sqlite3_load_extension],
3200+
[have_sqlite3_load_extension=yes],
3201+
[have_sqlite3_load_extension=no])
32003202
])
32013203

32023204
AS_VAR_COPY([CFLAGS], [save_CFLAGS])

pyconfig.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,6 @@
634634
/* Define to 1 if you have the `sendfile' library (-lsendfile). */
635635
#undef HAVE_LIBSENDFILE
636636

637-
/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
638-
#undef HAVE_LIBSQLITE3
639-
640637
/* Define to 1 if you have the <libutil.h> header file. */
641638
#undef HAVE_LIBUTIL_H
642639

0 commit comments

Comments
 (0)