Merge changes from emacs-23 branch

1 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index df753d1f005..178c8d8e5d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * configure.in: Test existence of xaw3d library, not just the
+        header (Bug#7642).
+
 2011-01-31  Eli Zaretskii  <eliz@gnu.org>
 
         * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
         $(BLD)/time_r.$(O).
         ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
         $(EMACS_ROOT)/src/m/intel386.h.
-        ($(BLD)/strftime.$(O)): 
+        ($(BLD)/strftime.$(O)):
         ($(BLD)/time_r.$(O)): Define prerequisites.
 
 2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>