merge trunk

1 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b1b4a39e1fb..ab69ce7b457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-05-14  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (cpp_undefs): Add mktime, register, X11.
+
+        * configure.in (GPM_MOUSE_SUPPORT): Remove.
+        (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables.
+        (HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM.
+
+        * configure.in (NS_IMPL_GNUSTEP_INC): New output variable.
+        (GNUSTEP_MAKEFILES): Do not output.
+
+2010-05-13  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Fix some paren typos.
+
+        * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
+
+        * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.
+
 2010-05-12  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.