aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-22 21:09:31 -0500
committerGlenn Morris2014-01-22 21:09:31 -0500
commit893e631c5228fa7037da79bbc68efe4419e09865 (patch)
tree5a018a00d24c219d0c5a4539ca56c15357fd3370
parent45d9ec7571c1b6ec6050db4bf81e45405997ddec (diff)
downloademacs-893e631c5228fa7037da79bbc68efe4419e09865.tar.gz
emacs-893e631c5228fa7037da79bbc68efe4419e09865.zip
Downplay LessTif in docs, since Motif is now free software,
and even http://lesstif.sourceforge.net/ recommends it over LessTif.
-rw-r--r--INSTALL16
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 11 deletions
diff --git a/INSTALL b/INSTALL
index 29a6339d365..ea0331da62f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -254,14 +254,11 @@ accept a list of directories, separated with colons.
254To get more attractive menus, you can specify an X toolkit when you 254To get more attractive menus, you can specify an X toolkit when you
255configure Emacs; use the option `--with-x-toolkit=TOOLKIT', where 255configure Emacs; use the option `--with-x-toolkit=TOOLKIT', where
256TOOLKIT is `gtk' (the default), `athena', or `motif' (`yes' and 256TOOLKIT is `gtk' (the default), `athena', or `motif' (`yes' and
257`lucid' are synonyms for `athena'). On some systems, it does not work 257`lucid' are synonyms for `athena'). Compiling with Motif causes a
258to use a toolkit with shared libraries. A free implementation of 258standard File Selection Dialog to pop up when you invoke file commands
259Motif, called LessTif, is available from <http://www.lesstif.org>. 259with the mouse. You can get fancy 3D-style scroll bars, even without
260Compiling with LessTif or Motif causes a standard File Selection 260Gtk or Motif, if you have the Xaw3d library installed (see
261Dialog to pop up when you invoke file commands with the mouse. You 261"Image support libraries" above for Xaw3d availability).
262can get fancy 3D-style scroll bars, even without Gtk or LessTif/Motif,
263if you have the Xaw3d library installed (see "Image support libraries"
264above for Xaw3d availability).
265 262
266You can tell configure where to search for GTK by specifying 263You can tell configure where to search for GTK by specifying
267`--with-pkg-config-prog=PATH' where PATH is the pathname to 264`--with-pkg-config-prog=PATH' where PATH is the pathname to
@@ -295,8 +292,7 @@ or more of these options:
295 --without-gif for GIF image support 292 --without-gif for GIF image support
296 --without-png for PNG image support 293 --without-png for PNG image support
297 294
298Use --without-toolkit-scroll-bars to disable LessTif/Motif or Xaw3d 295Use --without-toolkit-scroll-bars to disable Motif or Xaw3d scroll bars.
299scroll bars.
300 296
301Use --without-xim to inhibit the default use of X Input Methods. 297Use --without-xim to inhibit the default use of X Input Methods.
302In this case, the X resource useXIM can be used to turn on use of XIM. 298In this case, the X resource useXIM can be used to turn on use of XIM.
diff --git a/configure.ac b/configure.ac
index 626dcb1c3ea..326d52897ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1947,7 +1947,7 @@ if test "$window_system" = none && test "X$with_x" != "Xno"; then
1947 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then 1947 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
1948 AC_MSG_ERROR([You seem to be running X, but no X development libraries 1948 AC_MSG_ERROR([You seem to be running X, but no X development libraries
1949were found. You should install the relevant development files for X 1949were found. You should install the relevant development files for X
1950and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make 1950and for the toolkit you want, such as Gtk+ or Motif. Also make
1951sure you have development files for image handling, i.e. 1951sure you have development files for image handling, i.e.
1952tiff, gif, jpeg, png and xpm. 1952tiff, gif, jpeg, png and xpm.
1953If you are sure you want Emacs compiled without X window support, pass 1953If you are sure you want Emacs compiled without X window support, pass