[Emacs-diffs] Changes to emacs/configure

[YAMAMOTO Mitsuharu]

Index: emacs/configure
diff -c emacs/configure:1.159 emacs/configure:1.160
*** emacs/configure:1.159       Sat Sep 10 11:35:08 2005
--- emacs/configure     Tue Oct  4 09:19:24 2005
***************
*** 8197,8248 ****
    fi
  fi
  
- case "${window_system}" in
-   x11 )
-     HAVE_X_WINDOWS=yes
-     HAVE_X11=yes
-     case "${with_x_toolkit}" in
-       athena | lucid ) USE_X_TOOLKIT=LUCID ;;
-       motif ) USE_X_TOOLKIT=MOTIF ;;
-       gtk ) with_gtk=yes
-             USE_X_TOOLKIT=none ;;
-       no ) USE_X_TOOLKIT=none ;;
-       * ) USE_X_TOOLKIT=maybe ;;
-     esac
-   ;;
-   none )
-     HAVE_X_WINDOWS=no
-     HAVE_X11=no
-     USE_X_TOOLKIT=none
-   ;;
- esac
- 
- ### If we're using X11, we should use the X menu package.
- HAVE_MENUS=no
- case ${HAVE_X11} in
-   yes ) HAVE_MENUS=yes ;;
- esac
- 
- if test "${opsys}" = "hpux9"; then
-   case "${x_libraries}" in
-     *X11R4* )
-       opsysfile="s/hpux9-x11r4.h"
-       ;;
-   esac
- fi
- 
- if test "${opsys}" = "hpux9shr"; then
-   case "${x_libraries}" in
-     *X11R4* )
-       opsysfile="s/hpux9shxr4.h"
-       ;;
-   esac
- fi
- 
  HAVE_CARBON=no
! if test "${HAVE_X11}" != "yes"; then
!   if test "${with_carbon}" != "no"; then
!      if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
    echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
  echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
  if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
--- 8197,8205 ----
    fi
  fi
  
  HAVE_CARBON=no
! if test "${with_carbon}" != no; then
!   if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
    echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
  echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
  if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
***************
*** 8384,8391 ****
--- 8341,8398 ----
  fi
  
  
+ 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
+     HAVE_X11=yes
+     case "${with_x_toolkit}" in
+       athena | lucid ) USE_X_TOOLKIT=LUCID ;;
+       motif ) USE_X_TOOLKIT=MOTIF ;;
+       gtk ) with_gtk=yes
+             USE_X_TOOLKIT=none ;;
+       no ) USE_X_TOOLKIT=none ;;
+       * ) USE_X_TOOLKIT=maybe ;;
+     esac
+   ;;
+   mac | none )
+     HAVE_X_WINDOWS=no
+     HAVE_X11=no
+     USE_X_TOOLKIT=none
+   ;;
+ esac
+ 
+ ### If we're using X11, we should use the X menu package.
+ HAVE_MENUS=no
+ case ${HAVE_X11} in
+   yes ) HAVE_MENUS=yes ;;
+ esac
+ 
+ if test "${opsys}" = "hpux9"; then
+   case "${x_libraries}" in
+     *X11R4* )
+       opsysfile="s/hpux9-x11r4.h"
+       ;;
+   esac
+ fi
+ 
+ if test "${opsys}" = "hpux9shr"; then
+   case "${x_libraries}" in
+     *X11R4* )
+       opsysfile="s/hpux9shxr4.h"
+       ;;
+   esac
+ fi
  
  ### Compute the unexec source name from the object name.
  UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
***************
*** 12716,12722 ****
  #define HAVE_CARBON 1
  _ACEOF
  
-   window_system=mac
    ## Specify the install directory
    carbon_appdir=
    if test "${carbon_appdir_x}" != ""; then
--- 12723,12728 ----