From cacacdfcf1990b5d584a49cd473de0ece059c81b Mon Sep 17 00:00:00 2001
From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 8 Nov 2006 08:02:49 +0000
Subject: [PATCH] =?utf8?q?Prefer=20X11=20to=20Carbon=20only=20when=20some?=
 =?utf8?q?=20X-specific=20option=20is=20specified=20(Thanks=20to=20Jan=20D?=
 =?utf8?q?j=EF=BF=BD=20and=20Andreas=20Schwab).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 configure.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 10e843d2a2..871c0dac5e 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
-- 
2.39.2