From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 8 Nov 2006 08:03:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.91~216
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5a31d8b6f0ffd1087367389f7e19bcb0b2c0ddd;p=emacs.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 65cd76c8847..67ec8cd7c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* configure.in: Prefer X11 to Carbon only when some X-specific
+	option is specified (Thanks to Jan Dj,Ad(Brv and Andreas Schwab).
+
+	* configure: Regenerate.
+
 2006-11-04  Romain Francoise  <romain@orebokech.com>
 
 	* Makefile.in (bootstrap-clean-before): Use new target `bootstrap-clean'
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 914874c6cc1..b1a79bc9edd 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* INSTALL: Remove descriptions about --without-x.  Remove
+	--without-carbon from configure options for X11 build.
+
 2006-09-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* INSTALL: Remove descriptions about experimental flags.