From: Glenn Morris <rgm@gnu.org>
Date: Sat, 20 Jan 2018 16:23:30 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5841
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec6ef1e38b2618b3c5bdd28e2d4dac0afa2b3033;p=emacs.git

Merge from origin/emacs-26

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

Conflicts:
	configure.ac
---

ec6ef1e38b2618b3c5bdd28e2d4dac0afa2b3033
diff --cc configure.ac
index 31d2a15f6ce,f9c7bb76e58..1c4255da3f0
--- a/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} ;;