From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 13 May 2005 08:54:23 +0000 (+0000)
Subject: Don't check HAVE_CARBON if HAVE_X11 is set to yes.  Check HAVE_CARBON
X-Git-Tag: ttn-vms-21-2-B4~341
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de0a3247ca629356262b000a0a368bcb32f70bc6;p=emacs.git

Don't check HAVE_CARBON if HAVE_X11 is set to yes.  Check HAVE_CARBON
before USE_TOOLKIT_SCROLL_BARS.  Define USE_TOOLKIT_SCROLL_BARS by
default if HAVE_CARBON is set to yes.
---

diff --git a/configure.in b/configure.in
index e384ed68b5d..181b86007df 100644
--- a/configure.in
+++ b/configure.in
@@ -1694,6 +1694,13 @@ if test "${opsys}" = "hpux9shr"; then
   esac
 fi
 
+HAVE_CARBON=no
+if test "${HAVE_X11}" != "yes"; then
+  if test "${with_carbon}" != "no"; then
+     AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
+  fi
+fi
+
 ### Compute the unexec source name from the object name.
 UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
 
@@ -2155,6 +2162,9 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
   elif test "${HAVE_GTK}" = "yes"; then
     AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
     USE_TOOLKIT_SCROLL_BARS=yes
+  elif test "${HAVE_CARBON}" = "yes"; then
+    AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
+    USE_TOOLKIT_SCROLL_BARS=yes
   fi
 fi
 
@@ -2308,15 +2318,10 @@ if test "${HAVE_X11}" = "yes"; then
   fi
 fi
 
-### Use Mac OS X Carbon API to implement GUI.
-HAVE_CARBON=no
-if test "${with_carbon}" != "no"; then
-  AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
-fi
-
 dnl Check for malloc/malloc.h on darwin
 AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.]))
 
+### Use Mac OS X Carbon API to implement GUI.
 if test "${HAVE_CARBON}" = "yes"; then
   AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
   window_system=mac