# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1162972969 0
# Node ID 9ba59a3beadd949f16af87227f3b92f6ebe9fda7
# Parent  9966f8bc610d8fafc419e05bd45e9ed3e79ff68f
Prefer X11 to Carbon only when some X-specific
option is specified (Thanks to Jan Dj? and Andreas Schwab).

diff -r 9966f8bc610d -r 9ba59a3beadd configure.in
--- a/configure.in	Wed Nov 08 07:34:24 2006 +0000
+++ b/configure.in	Wed Nov 08 08:02:49 2006 +0000
@@ -1779,7 +1779,13 @@
 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