diff options
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-11-08 08:02:49 +0000 |
---|---|---|
committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-11-08 08:02:49 +0000 |
commit | cacacdfcf1990b5d584a49cd473de0ece059c81b (patch) | |
tree | 55fd07c7817b1b8bb1ef6c6816d6714fabca4a5a /configure.in | |
parent | b2020e89330a16f31d1123e6dc4df26af0e830a8 (diff) | |
download | emacs-cacacdfcf1990b5d584a49cd473de0ece059c81b.tar.gz |
Prefer X11 to Carbon only when some X-specific
option is specified (Thanks to Jan Dj� and Andreas Schwab).
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 10e843d2a26..871c0dac5e7 100644 --- a/configure.in +++ b/configure.in @@ -1779,7 +1779,13 @@ fi if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then if test "${with_carbon+set}" != set \ && test "${carbon_appdir_x+set}" != set; then - HAVE_CARBON=no + for var in with_x with_x_toolkit with_gtk with_xim \ + with_xpm with_jpeg with_tiff with_gif with_png; do + if eval test \"\${$var+set}\" = set; then + HAVE_CARBON=no + break + fi + done fi fi if test "${HAVE_CARBON}" = yes; then |