[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/sqlite 249339b 2/2: Make dynamic loading work under mingw
From: |
Lars Ingebrigtsen |
Subject: |
scratch/sqlite 249339b 2/2: Make dynamic loading work under mingw |
Date: |
Thu, 9 Dec 2021 19:57:43 -0500 (EST) |
branch: scratch/sqlite
commit 249339b784dcaa5007e468e0ba5a633a76521882
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make dynamic loading work under mingw
---
configure.ac | 8 ++++++--
lisp/term/w32-win.el | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e81b380..5eb2384 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2685,12 +2685,16 @@ fi
### Use -lsqlite3 if available, unless '--with-sqlite3=no'
HAVE_SQLITE3=no
if test "${with_sqlite3}" != "no"; then
- AC_CHECK_LIB(sqlite3, sqlite3_finalize, HAVE_SQLITE3=yes, HAVE_SQLITE3=no)
- if test $HAVE_SQLITE3 = yes; then
+ AC_CHECK_LIB(sqlite3, sqlite3_open_v2, HAVE_SQLITE3=yes, HAVE_SQLITE3=no)
+ if test "$HAVE_SQLITE3" = "yes"; then
SQLITE3_LIBS=-lsqlite3
AC_SUBST(SQLITE3_LIBS)
LIBS="$SQLITE3_LIBS $LIBS"
AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the libsqlite3
library (-lsqlite).])
+ # Windows loads libwebp dynamically
+ if test "${opsys}" = "mingw32"; then
+ SQLITE3_LIBS=
+ fi
fi
fi
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 8b745c4..0ee010b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -275,6 +275,7 @@ See the documentation of `create-fontset-from-fontset-spec'
for the format.")
'(gif "libgif-5.dll" "giflib4.dll" "libungif4.dll" "libungif.dll")))
'(svg "librsvg-2-2.dll")
'(webp "libwebp-7.dll" "libwebp.dll")
+ '(sqlite3 "libsqlite3-0.dll")
'(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
'(glib "libglib-2.0-0.dll")
'(gio "libgio-2.0-0.dll")