aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2010-05-14 17:54:24 -0700
committerGlenn Morris2010-05-14 17:54:24 -0700
commit3df7b338249e90303a379b86e7aedbb0a7dec9ca (patch)
treef9bfdff9b1e6005e5c17061e238a63dae0554014 /admin
parent2b5f541b4f67c7978cf124012593c7ceaeab6292 (diff)
downloademacs-3df7b338249e90303a379b86e7aedbb0a7dec9ca.tar.gz
emacs-3df7b338249e90303a379b86e7aedbb0a7dec9ca.zip
If HAVE_X11, also HAVE_X_WINDOWS and HAVE_MENUS.
* src/Makefile.in: Simplify cpp conditional. * admin/CPP-DEFINES: Comment.
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES3
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 1f42eeb9528..cffbcf95e80 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -22,6 +22,9 @@ NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API.
22NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. 22NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API.
23HAVE_X11 Compile support for the X11 GUI. 23HAVE_X11 Compile support for the X11 GUI.
24HAVE_X_WINDOWS Compile support for X Window system 24HAVE_X_WINDOWS Compile support for X Window system
25 (It looks like, nowadays, if HAVE_X11 is set, HAVE_X_WINDOWS must
26 be, and vice versa. At least, this is true for configure, and
27 msdos; not sure about nt.)
25USE_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11. 28USE_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11.
26USE_MOTIF Use the Motif toolkit for menus&scrollbars. Requires HAVE_X11. 29USE_MOTIF Use the Motif toolkit for menus&scrollbars. Requires HAVE_X11.
27USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11. 30USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11.