diff options
| author | Robert Pluim <rpluim@gmail.com> | 2021-12-21 18:39:39 +0100 |
|---|---|---|
| committer | Robert Pluim <rpluim@gmail.com> | 2021-12-21 18:39:39 +0100 |
| commit | b7d31d619247d1299d8a361945dddac8659811ee (patch) | |
| tree | 02a75c1681c9077d9fb97d1c42104d64a61c900a | |
| parent | 16ed9fad2c86565493cedfabee8df0cf1e8b5cd3 (diff) | |
| download | emacs-b7d31d619247d1299d8a361945dddac8659811ee.tar.gz | |
Revert "Remove Motif support"
This reverts commit db237850abc240e2c3e765e9cc7e15ee5681dcaf.
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | etc/NEWS | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 766811b8a8e..357d2538e64 100644 --- a/configure.ac +++ b/configure.ac @@ -410,18 +410,19 @@ dnl This should be the last --with option, because --with-x is dnl added later on when we find the file name of X, and it's best to dnl keep them together visually. AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT], - [use an X toolkit (KIT one of: yes or gtk, gtk2, gtk3, lucid or athena, no)])], + [use an X toolkit (KIT one of: yes or gtk, gtk2, gtk3, lucid or athena, motif, no)])], [ case "${withval}" in y | ye | yes ) val=gtk ;; n | no ) val=no ;; l | lu | luc | luci | lucid ) val=lucid ;; a | at | ath | athe | athen | athena ) val=athena ;; + m | mo | mot | moti | motif ) val=motif ;; g | gt | gtk ) val=gtk ;; gtk2 ) val=gtk2 ;; gtk3 ) val=gtk3 ;; * ) AC_MSG_ERROR(['--with-x-toolkit=$withval' is invalid; -this option's value should be 'yes', 'no', 'lucid', 'athena', 'gtk', +this option's value should be 'yes', 'no', 'lucid', 'athena', 'motif', 'gtk', 'gtk2' or 'gtk3'. 'yes' and 'gtk' are synonyms. 'athena' and 'lucid' are synonyms.]) ;; @@ -460,7 +461,7 @@ OPTION_DEFAULT_ON([harfbuzz],[don't use HarfBuzz for text shaping]) OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support]) OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping]) -OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Xaw3d/GTK toolkit scroll bars]) +OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif/Xaw3d/GTK toolkit scroll bars]) OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) OPTION_DEFAULT_ON([xim],[at runtime, default X11 XIM to off]) OPTION_DEFAULT_ON([xdbe],[don't use X11 double buffering support]) @@ -2251,7 +2252,7 @@ if test "$window_system" = none && test "X$with_x" != "Xno"; then then AC_MSG_ERROR([You seem to be running X, but no X development libraries were found. You should install the relevant development files for X -and for the toolkit you want, such as Gtk+. Also make +and for the toolkit you want, such as Gtk+ or Motif. Also make sure you have development files for image handling, i.e. tiff, gif, jpeg, png and xpm. If you are sure you want Emacs compiled without X window support, pass @@ -78,9 +78,6 @@ shaping, so 'configure' now recommends that combination. at build time. --- -** Support for building with Motif has been removed. - ---- ** The configure option '--without-makeinfo' has been removed. This was only ever relevant when building from a repository checkout. This now requires makeinfo, which is part of the texinfo package. |