[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master ec6ef1e 1/3: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master ec6ef1e 1/3: Merge from origin/emacs-26 |
Date: |
Sat, 20 Jan 2018 11:28:14 -0500 (EST) |
branch: master
commit ec6ef1e38b2618b3c5bdd28e2d4dac0afa2b3033
Merge: 530bb2d 297dc41
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
297dc41 * configure.ac (emacs_config_features): Add threads.
Conflicts:
configure.ac
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 31d2a15..1c4255d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5401,12 +5401,13 @@ 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 JSON CANNOT_DUMP LCMS2; do
case $opt in
CANNOT_DUMP) eval val=\${$opt} ;;
NOTIFY|ACL) eval val=\${${opt}_SUMMARY} ;;
TOOLKIT_SCROLL_BARS|X_TOOLKIT) eval val=\${USE_$opt} ;;
+ THREADS) val=${threads_enabled} ;;
*) eval val=\${HAVE_$opt} ;;
esac
case x$val in