/[emacs]/emacs/configure.in
ViewVC logotype

Diff of /emacs/configure.in

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

revision 1.397 by eliz, Sat Sep 10 11:32:51 2005 UTC revision 1.398 by mituharu, Tue Oct 4 09:19:37 2005 UTC
# Line 1668  else Line 1668  else
1668    fi    fi
1669  fi  fi
1670    
1671    HAVE_CARBON=no
1672    if test "${with_carbon}" != no; then
1673      AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
1674    fi
1675    if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
1676      if test "${with_carbon+set}" != set \
1677         && test "${carbon_appdir_x+set}" != set; then
1678        HAVE_CARBON=no
1679      fi
1680    fi
1681    if test "${HAVE_CARBON}" = yes; then
1682      window_system=mac
1683    fi
1684    
1685  case "${window_system}" in  case "${window_system}" in
1686    x11 )    x11 )
1687      HAVE_X_WINDOWS=yes      HAVE_X_WINDOWS=yes
# Line 1686  dnl make this decision later: use the to Line 1700  dnl make this decision later: use the to
1700        * ) USE_X_TOOLKIT=maybe ;;        * ) USE_X_TOOLKIT=maybe ;;
1701      esac      esac
1702    ;;    ;;
1703    none )    mac | none )
1704      HAVE_X_WINDOWS=no      HAVE_X_WINDOWS=no
1705      HAVE_X11=no      HAVE_X11=no
1706      USE_X_TOOLKIT=none      USE_X_TOOLKIT=none
# Line 1715  if test "${opsys}" = "hpux9shr"; then Line 1729  if test "${opsys}" = "hpux9shr"; then
1729    esac    esac
1730  fi  fi
1731    
 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  
   
1732  ### Compute the unexec source name from the object name.  ### Compute the unexec source name from the object name.
1733  UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"  UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
1734    
# Line 2345  AC_CHECK_HEADER(malloc/malloc.h, AC_DEFI Line 2352  AC_CHECK_HEADER(malloc/malloc.h, AC_DEFI
2352  ### Use Mac OS X Carbon API to implement GUI.  ### Use Mac OS X Carbon API to implement GUI.
2353  if test "${HAVE_CARBON}" = "yes"; then  if test "${HAVE_CARBON}" = "yes"; then
2354    AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])    AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
   window_system=mac  
2355    ## Specify the install directory    ## Specify the install directory
2356    carbon_appdir=    carbon_appdir=
2357    if test "${carbon_appdir_x}" != ""; then    if test "${carbon_appdir_x}" != ""; then

Legend:
Removed from v.1.397  
changed lines
  Added in v.1.398

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