[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Fri, 25 Jan 2008 04:32:33 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/01/25 04:32:32
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -b -r1.498 -r1.499
--- configure.in 24 Jan 2008 04:50:22 -0000 1.498
+++ configure.in 25 Jan 2008 04:32:32 -0000 1.499
@@ -101,6 +101,7 @@
OPTION_DEFAULT_ON([sound],[don't compile with sound support])
+dnl FIXME currently it is not the last.
dnl This should be the last --with option, because --with-x is
dnl added later on when we find the path of X, and it's best to
dnl keep them together visually.
@@ -122,19 +123,24 @@
with_x_toolkit=$val
])
-OPTION_DEFAULT_OFF([xpm],[use -lXpm for displaying XPM images])
-OPTION_DEFAULT_OFF([jpeg],[use -ljpeg for displaying JPEG images])
-OPTION_DEFAULT_OFF([tiff],[use -ltiff for displaying TIFF images])
-OPTION_DEFAULT_OFF([gif],[use -lgif (or -lungif) for displaying GIF images])
-OPTION_DEFAULT_OFF([png],[use -lpng for displaying PNG images])
-OPTION_DEFAULT_OFF([gpm],[use -lgpm for mouse support on a GNU/Linux console])
-OPTION_DEFAULT_OFF([rsvg],[use -lrsvg-2 for displaying SVG images])
-OPTION_DEFAULT_OFF([gtk],[use GTK (same as --with-x-toolkit=gtk)])
+dnl _ON results in a '--without' option in the --help output, so
+dnl the help text should refer to "don't compile", etc.
+OPTION_DEFAULT_ON([xpm],[don't compile with XPM image support])
+OPTION_DEFAULT_ON([jpeg],[don't compile with JPEG image support])
+OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image support])
+OPTION_DEFAULT_ON([gif],[don't compile with GIF image support])
+OPTION_DEFAULT_ON([png],[don't compile with PNG image support])
+OPTION_DEFAULT_ON([rsvg],[don't compile with SVG image support])
+
+OPTION_DEFAULT_OFF([gtk],[use GTK toolkit])
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
-OPTION_DEFAULT_ON([carbon],[don't use Carbon GUI on Mac OS X])
-OPTION_DEFAULT_ON([dbus],[use D-Bus])
+OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X. **UNSUPPORTED!**])
+
+OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux
console])
+OPTION_DEFAULT_OFF([dbus],[compile with D-Bus support])
+
AC_ARG_WITH([pkg-config-prog],dnl
[AS_HELP_STRING([--with-pkg-config-prog=PATH],
- [Emacs-diffs] Changes to emacs/configure.in,v, (continued)
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/01/05
- [Emacs-diffs] Changes to emacs/configure.in,v, Romain Francoise, 2008/01/06
- [Emacs-diffs] Changes to emacs/configure.in,v, Miles Bader, 2008/01/08
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/01/13
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/01/16
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/01/16
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2008/01/17
- [Emacs-diffs] Changes to emacs/configure.in,v, Michael W. Olson, 2008/01/22
- [Emacs-diffs] Changes to emacs/configure.in,v, Michael W. Olson, 2008/01/22
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/01/23
- [Emacs-diffs] Changes to emacs/configure.in,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/01/25
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/01/26
- [Emacs-diffs] Changes to emacs/configure.in,v, Dan Nicolaescu, 2008/01/27
- [Emacs-diffs] Changes to emacs/configure.in,v, Miles Bader, 2008/01/29