/[emacs]/emacs/configure
ViewVC logotype

Diff of /emacs/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.159 by eliz, Sat Sep 10 11:35:08 2005 UTC revision 1.160 by mituharu, Tue Oct 4 09:19:24 2005 UTC
# Line 8197  else Line 8197  else
8197    fi    fi
8198  fi  fi
8199    
 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  
   
8200  HAVE_CARBON=no  HAVE_CARBON=no
8201  if test "${HAVE_X11}" != "yes"; then  if test "${with_carbon}" != no; then
8202    if test "${with_carbon}" != "no"; then    if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
      if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then  
8203    echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5    echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
8204  echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6  echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
8205  if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then  if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
# Line 8384  if test $ac_cv_header_Carbon_Carbon_h = Line 8341  if test $ac_cv_header_Carbon_Carbon_h =
8341  fi  fi
8342    
8343    
8344    fi
8345    if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
8346      if test "${with_carbon+set}" != set \
8347         && test "${carbon_appdir_x+set}" != set; then
8348        HAVE_CARBON=no
8349    fi    fi
8350  fi  fi
8351    if test "${HAVE_CARBON}" = yes; then
8352      window_system=mac
8353    fi
8354    
8355    case "${window_system}" in
8356      x11 )
8357        HAVE_X_WINDOWS=yes
8358        HAVE_X11=yes
8359        case "${with_x_toolkit}" in
8360          athena | lucid ) USE_X_TOOLKIT=LUCID ;;
8361          motif ) USE_X_TOOLKIT=MOTIF ;;
8362          gtk ) with_gtk=yes
8363                USE_X_TOOLKIT=none ;;
8364          no ) USE_X_TOOLKIT=none ;;
8365          * ) USE_X_TOOLKIT=maybe ;;
8366        esac
8367      ;;
8368      mac | none )
8369        HAVE_X_WINDOWS=no
8370        HAVE_X11=no
8371        USE_X_TOOLKIT=none
8372      ;;
8373    esac
8374    
8375    ### If we're using X11, we should use the X menu package.
8376    HAVE_MENUS=no
8377    case ${HAVE_X11} in
8378      yes ) HAVE_MENUS=yes ;;
8379    esac
8380    
8381    if test "${opsys}" = "hpux9"; then
8382      case "${x_libraries}" in
8383        *X11R4* )
8384          opsysfile="s/hpux9-x11r4.h"
8385          ;;
8386      esac
8387    fi
8388    
8389    if test "${opsys}" = "hpux9shr"; then
8390      case "${x_libraries}" in
8391        *X11R4* )
8392          opsysfile="s/hpux9shxr4.h"
8393          ;;
8394      esac
8395    fi
8396    
8397  ### Compute the unexec source name from the object name.  ### Compute the unexec source name from the object name.
8398  UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"  UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
# Line 12716  cat >>confdefs.h <<\_ACEOF Line 12723  cat >>confdefs.h <<\_ACEOF
12723  #define HAVE_CARBON 1  #define HAVE_CARBON 1
12724  _ACEOF  _ACEOF
12725    
   window_system=mac  
12726    ## Specify the install directory    ## Specify the install directory
12727    carbon_appdir=    carbon_appdir=
12728    if test "${carbon_appdir_x}" != ""; then    if test "${carbon_appdir_x}" != ""; then

Legend:
Removed from v.1.159  
changed lines
  Added in v.1.160

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26