aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-01-26 21:05:58 +0000
committerGlenn Morris2008-01-26 21:05:58 +0000
commitf7317f6c66b56413263ab8d1efd14d85e7bf6561 (patch)
tree706ea6204ae1d023d5b864343321abc7abbd06e6
parent44f714fda507effc32817d3e3f52260a3abeeb7a (diff)
downloademacs-f7317f6c66b56413263ab8d1efd14d85e7bf6561.tar.gz
emacs-f7317f6c66b56413263ab8d1efd14d85e7bf6561.zip
(--with-carbon): Tone down rhetoric in help text.
-rw-r--r--ChangeLog1
-rw-r--r--configure.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 557f5c27d9e..1f9820d386a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12008-01-26 Glenn Morris <rgm@gnu.org> 12008-01-26 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.in (--without-gcc): By default, neither off nor on. 3 * configure.in (--without-gcc): By default, neither off nor on.
4 (--with-carbon): Tone down rhetoric in help text.
4 5
52008-01-25 Glenn Morris <rgm@gnu.org> 62008-01-25 Glenn Morris <rgm@gnu.org>
6 7
diff --git a/configure.in b/configure.in
index a1db65b9f7a..abf67196b74 100644
--- a/configure.in
+++ b/configure.in
@@ -139,7 +139,7 @@ OPTION_DEFAULT_OFF([gtk],[use GTK toolkit])
139OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) 139OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
140OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) 140OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
141OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) 141OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
142OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X. **UNSUPPORTED!**]) 142OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X. This is unsupported!])
143 143
144OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) 144OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
145OPTION_DEFAULT_OFF([dbus],[compile with D-Bus support]) 145OPTION_DEFAULT_OFF([dbus],[compile with D-Bus support])