Merge from origin/emacs-26

297dc41 * configure.ac (emacs_config_features): Add threads.

Conflicts:
	configure.ac

diff --cc configure.ac
index 31d2a15f6cebdfdc4c7288fbf33bf027c3f3fd0f,f9c7bb76e58cf97b31a8bffb02f396ff71f84a86..1c4255da3f08f1ad375687fa5d242b9495a25b42
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5401,7 -5364,7 +5401,7 @@@ emacs_config_features
  for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
    GCONF GSETTINGS NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT \
    LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU X11 NS MODULES \
-   XWIDGETS LIBSYSTEMD JSON CANNOT_DUMP LCMS2; do
 -  THREADS XWIDGETS LIBSYSTEMD CANNOT_DUMP LCMS2; do
++  THREADS XWIDGETS LIBSYSTEMD JSON CANNOT_DUMP LCMS2; do
  
      case $opt in
        CANNOT_DUMP) eval val=\${$opt} ;;