m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=yes])dnl
])dnl
-OPTION_DEFAULT_ON([gcc],[don't use GCC to compile Emacs if GCC is found])
+dnl By default, neither off nor on.
+AC_ARG_WITH([gcc],
+[AS_HELP_STRING([--without-gcc],
+ [don't use GCC to compile Emacs even if GCC is found])])
OPTION_DEFAULT_ON([pop],[don't support POP mail retrieval with movemail])
if test "$with_pop" = yes; then
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.
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. This is 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],
+[AS_HELP_STRING([--with-pkg-config-prog=PATH],
[Path to pkg-config for finding GTK and librsvg])])
if test "X${with_pkg_config_prog}" != X; then
if test "${with_pkg_config_prog}" != yes; then
fi
dnl D-Bus has been tested under GNU/Linux only. Must be adapted for
-dnl other platforms. Support for higher D-Bus versions but 1.0 is
+dnl other platforms. Support for higher D-Bus versions than 1.0 is
dnl also not configured.
HAVE_DBUS=no
-AC_MSG_CHECKING([maybe dbus])
if test "${with_dbus}" = "yes"; then
PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, HAVE_DBUS=yes, HAVE_DBUS=no)
if test "$HAVE_DBUS" = yes; then
AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.])
fi
- AC_MSG_RESULT($HAVE_DBUS)
-else
- AC_MSG_RESULT(no bub)
fi
### Link with -lXft if available to work around a bug.
#endif
/* Multi-tty support relies on MULTI_KBOARD. It seems safe to turn it
- on unconditionally. Note that src/s/darwin.h disables this at
- present. */
+ on unconditionally. */
#ifndef MULTI_KBOARD
#define MULTI_KBOARD
#endif
echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
+echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo