In src:

2002-07-31  Andrew Choi  <akochoi@shaw.ca>

	* s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if
	HAVE_CARBON is defined.

In mac:

2002-07-31  Andrew Choi  <akochoi@shaw.ca>

	* INSTALL: Add instructions for building X Window version.

2 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 58d1770e1e0..2ec775cda16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-31  Andrew Choi  <akochoi@shaw.ca>
+
+        * s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if
+        HAVE_CARBON is defined.
+
 2002-07-31  Richard M. Stallman  <rms@gnu.org>
 
         * xmenu.c (set_frame_menubar): First parse all submenus,
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 59f63f57189..a4b3b727537 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -40,8 +40,10 @@ Boston, MA 02111-1307, USA.  */
 /* MAC_OS is used to conditionally compile code common to both MAC_OS8
    and MAC_OSX.  */
 #ifdef MAC_OSX
+#ifdef HAVE_CARBON
 #define MAC_OS
 #endif
+#endif
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
@@ -222,7 +224,9 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_SOCKETS
 
 /* Extra initialization calls in main for Mac OS X system type.  */
+#ifdef HAVE_CARBON
 #define SYMS_SYSTEM syms_of_mac()
+#endif
 
 /* Definitions for how to dump.  Copied from nextstep.h.  */
 
@@ -271,7 +275,9 @@ Boston, MA 02111-1307, USA.  */
 
 /* Tell src/Makefile.in to create files in the Mac OS X application
    bundle mac/Emacs.app.  */
+#ifdef HAVE_CARBON
 #define OTHER_FILES macosx-app
+#endif
 
 
 /* Define the following so emacs symbols will not conflict with those