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

[YAMAMOTO Mitsuharu]

Index: emacs/configure.in
diff -c emacs/configure.in:1.397 emacs/configure.in:1.398
*** emacs/configure.in:1.397    Sat Sep 10 11:32:51 2005
--- emacs/configure.in  Tue Oct  4 09:19:37 2005
***************
*** 1668,1673 ****
--- 1668,1687 ----
    fi
  fi
  
+ HAVE_CARBON=no
+ if test "${with_carbon}" != no; then
+   AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
+ 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
+   fi
+ fi
+ if test "${HAVE_CARBON}" = yes; then
+   window_system=mac
+ fi
+ 
  case "${window_system}" in
    x11 )
      HAVE_X_WINDOWS=yes
***************
*** 1686,1692 ****
        * ) USE_X_TOOLKIT=maybe ;;
      esac
    ;;
!   none )
      HAVE_X_WINDOWS=no
      HAVE_X11=no
      USE_X_TOOLKIT=none
--- 1700,1706 ----
        * ) USE_X_TOOLKIT=maybe ;;
      esac
    ;;
!   mac | none )
      HAVE_X_WINDOWS=no
      HAVE_X11=no
      USE_X_TOOLKIT=none
***************
*** 1715,1727 ****
    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/'`"
  
--- 1729,1734 ----
***************
*** 2345,2351 ****
  ### 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
    ## Specify the install directory
    carbon_appdir=
    if test "${carbon_appdir_x}" != ""; then
--- 2352,2357 ----