From: Yuuki Harano <masm+github@masm11.me>
Date: Wed, 20 Jan 2021 12:46:03 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3737
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bebc657aad7c9b448a8e0cafd9d09d7774097975;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
---

bebc657aad7c9b448a8e0cafd9d09d7774097975
diff --cc configure.ac
index 815d3c98c3a,bea28338090..369d4f46762
--- a/configure.ac
+++ b/configure.ac
@@@ -5750,12 -5677,14 +5756,14 @@@ Configured for '${canonical}'
    Where do we find X Windows header files?                ${x_includes:-$emacs_standard_dirs}
    Where do we find X Windows libraries?                   ${x_libraries:-$emacs_standard_dirs}"])
  
+ #### Please respect alphabetical ordering when making additions.
  optsep=
  emacs_config_features=
- for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
-   GCONF GSETTINGS GLIB NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE HARFBUZZ M17N_FLT \
-   LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU PGTK X11 XDBE XIM \
-   NS MODULES THREADS XWIDGETS LIBSYSTEMD JSON PDUMPER UNEXEC LCMS2 GMP; do
+ for opt in ACL CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
+  HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
 - M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PNG RSVG SOUND THREADS TIFF \
++ M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SOUND THREADS TIFF \
+  TOOLKIT_SCROLL_BARS UNEXEC X11 XAW3D XDBE XFT XIM XPM XWIDGETS X_TOOLKIT \
+  ZLIB; do
  
      case $opt in
        PDUMPER) val=${with_pdumper} ;;