Re: mac/INSTALL needs editing

[YAMAMOTO Mitsuharu]

>>>>> On Tue, 09 Aug 2005 17:10:58 -0400, Gilbert Harman <address@hidden> said:

> GNU Emacs 22.0.50.1 (powerpc-apple-darwin8.2.0, X toolkit) of
                                                  ^^^^^^^^^
You need to specify --without-x as described in mac/INSTALL:

  If you have X Window installed on your Mac and you are building Emacs
  to run under Carbon and not X Window, you need to type `./configure
  --without-x' instead of `./configure'.

Though mac/INSTALL contains sufficient information, it would make
sense to prefer Carbon (even if X11 is installed) when either
--with-carbon or --enable-carbon-app is specified explicitly.

                                     YAMAMOTO Mitsuharu
                                address@hidden

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.395
diff -c -r1.395 configure.in
*** configure.in        26 Jul 2005 21:43:11 -0000      1.395
--- configure.in        10 Aug 2005 01:39:13 -0000
***************
*** 1660,1665 ****
--- 1660,1679 ----
    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
***************
*** 1678,1684 ****
        * ) USE_X_TOOLKIT=maybe ;;
      esac
    ;;
!   none )
      HAVE_X_WINDOWS=no
      HAVE_X11=no
      USE_X_TOOLKIT=none
--- 1692,1698 ----
        * ) USE_X_TOOLKIT=maybe ;;
      esac
    ;;
!   mac | none )
      HAVE_X_WINDOWS=no
      HAVE_X11=no
      USE_X_TOOLKIT=none
***************
*** 1707,1719 ****
    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/'`"
  
--- 1721,1726 ----
***************
*** 2337,2343 ****
  ### 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
--- 2344,2349 ----