Merge from origin/emacs-26
297dc41
* configure.ac (emacs_config_features): Add threads.
Conflicts:
configure.ac
This commit is contained in:
commit
ec6ef1e38b
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue