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, 15 insertions, 3 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 8c5c3d62c2e..e7c4dbcdcb0 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-31  Andrew Choi  <akochoi@shaw.ca>
+
+        * INSTALL: Add instructions for building X Window version.
+
 2002-07-11  Andrew Choi  <akochoi@shaw.ca>
 
         * make-package: Change -a option to -R for cp command.
diff --git a/mac/INSTALL b/mac/INSTALL
index 13c127ccc7f..9076814d649 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -25,9 +25,6 @@ un-tarred.
 
 The last step must be performed as root.
 
-If you have X Window installed, you need to type `./configure
---without-x' instead of `./configure'.
-
 You can type `make bootstrap' instead of `make' to rebuild everything,
 including byte-compiling the Lisp files.
 
@@ -43,6 +40,17 @@ double-clicking on mac/Emacs.app in the Finder.  At present,
 command-line options cannot be passed to Emacs running under the Aqua
 GUI.  This should soon be fixed.
 
+If you are building Emacs to run on Mac OS X and X Window, you need to
+create a directory containing statically-linked X libraries.
+
+  sudo mkdir /usr/X11R6/libstatic
+  cd /usr/X11R6/libstatic
+  sudo ln -s ../lib/lib*.a ../lib/X11 .
+
+Instead of typing `./configure' above, type
+
+  ./configure --without-carbon --with-x --x-libraries=/usr/X11R6/libstatic
+
 To use colors in a terminal, put the following lines in the file
 ~/.termcap and log in again.