[Emacs-diffs] Changes to emacs/configure.in

[YAMAMOTO Mitsuharu]

Index: emacs/configure.in
diff -c emacs/configure.in:1.387 emacs/configure.in:1.388
*** emacs/configure.in:1.387    Sat Apr 23 15:49:36 2005
--- emacs/configure.in  Fri May 13 08:54:23 2005
***************
*** 1694,1699 ****
--- 1694,1706 ----
    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,2160 ****
--- 2162,2170 ----
    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,2322 ****
    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.]))
  
  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
--- 2318,2327 ----
    fi
  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