Merge remote-tracking branch 'origin/master' into feature/pgtk

diff --cc configure.ac
index f67829b0773d213219b18631506ea8854910c646,8d15c70d8477f0b009385e456bae8ef6c28d85e3..892c3e0b7b8336881af4f985949146c3a17f513b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2694,9 -2682,30 +2695,30 @@@ if test "${with_webp}" != "no"; the
     fi
  fi
  
+ ### Use -lsqlite3 if available, unless '--with-sqlite3=no'
+ HAVE_SQLITE3=no
+ if test "${with_sqlite3}" != "no"; 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
+      AC_CHECK_LIB(sqlite3, sqlite3_load_extension,
+          HAVE_SQLITE3_LOAD_EXTENSION=yes, HAVE_SQLITE3_LOAD_EXTENSION=no)
+      if test "$HAVE_SQLITE3_LOAD_EXTENSION" = "yes"; then
+        AC_DEFINE(HAVE_SQLITE3_LOAD_EXTENSION, 1, [Define to 1 if sqlite3 supports loading extensions.])
+      fi
+    fi
+ fi
+ 
  HAVE_IMAGEMAGICK=no
  if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes" || \
 -   test "${HAVE_BE_APP}" = "yes"; then
 +   test "${HAVE_BE_APP}" = "yes" || test "${window_system}" = "pgtk"; then
    if test "${with_imagemagick}" != "no"; then
      if test -n "$BREW"; then
        # Homebrew doesn't link ImageMagick 6 by default, so make sure
@@@ -6232,8 -6176,8 +6254,8 @@@ optsep
  emacs_config_features=
  for opt in ACL BE_APP CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
   HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
 - M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PNG RSVG SECCOMP \
 + M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP \
-  SOUND THREADS TIFF TOOLKIT_SCROLL_BARS \
+  SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS \
   UNEXEC WEBP X11 XAW3D XDBE XFT XIM XINPUT2 XPM XWIDGETS X_TOOLKIT \
   ZLIB; do
  

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge