Merged from [email protected].

Patches applied:

 * [email protected]/emacs--devo--0--patch-536
   Update from CVS

 * [email protected]/emacs--devo--0--patch-537
   Update from CVS

 * [email protected]/emacs--devo--0--patch-538
   Update from CVS

 * [email protected]/emacs--devo--0--patch-539
   Update from CVS

 * [email protected]/emacs--devo--0--patch-540
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-541
   Update from CVS

 * [email protected]/emacs--devo--0--patch-542
   Update from CVS

 * [email protected]/emacs--devo--0--patch-543
   Update from CVS

 * [email protected]/emacs--devo--0--patch-544
   Update from CVS

 * [email protected]/emacs--devo--0--patch-545
   Update from CVS

 * [email protected]/emacs--devo--0--patch-546
   Update from erc--emacs--22

 * [email protected]/emacs--devo--0--patch-547
   Update from CVS

 * [email protected]/emacs--devo--0--patch-548
   Update from CVS

 * [email protected]/emacs--devo--0--patch-549
   Update from CVS

 * [email protected]/emacs--devo--0--patch-550
   Update from CVS

 * [email protected]/emacs--devo--0--patch-551
   Update from CVS

 * [email protected]/emacs--devo--0--patch-552
   Update from CVS

 * [email protected]/emacs--devo--0--patch-553
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-554
   Update from CVS

 * [email protected]/emacs--devo--0--patch-555
   erc-iswitchb: Temporarily enable iswitchb mode

 * [email protected]/emacs--devo--0--patch-556
   Update from CVS

 * [email protected]/emacs--devo--0--patch-557
   Update from CVS

 * [email protected]/emacs--devo--0--patch-558
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-559
   Update from CVS

 * [email protected]/emacs--devo--0--patch-560
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-561
   Update from CVS

 * [email protected]/emacs--devo--0--patch-562
   Update from CVS

 * [email protected]/emacs--devo--0--patch-563
   Update from CVS

 * [email protected]/emacs--devo--0--patch-564
   Update from CVS

 * [email protected]/emacs--devo--0--patch-565
   Update from CVS

 * [email protected]/emacs--devo--0--patch-566
   Update from CVS

 * [email protected]/emacs--devo--0--patch-567
   Update from CVS

 * [email protected]/emacs--devo--0--patch-568
   Update from CVS

 * [email protected]/emacs--devo--0--patch-569
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-570
   Update from CVS

 * [email protected]/emacs--devo--0--patch-571
   Update from CVS

 * [email protected]/emacs--devo--0--patch-572
   Update from CVS

 * [email protected]/emacs--devo--0--patch-573
   Update from CVS

 * [email protected]/emacs--devo--0--patch-574
   Update from CVS

 * [email protected]/emacs--devo--0--patch-575
   Update from CVS

 * [email protected]/emacs--devo--0--patch-576
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-577
   Update from CVS

 * [email protected]/emacs--devo--0--patch-578
   Update from CVS

 * [email protected]/emacs--devo--0--patch-579
   Update from CVS

 * [email protected]/emacs--devo--0--patch-580
   Update from CVS

 * [email protected]/emacs--devo--0--patch-581
   Update from CVS

 * [email protected]/emacs--devo--0--patch-582
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-583
   Update from CVS

 * [email protected]/emacs--devo--0--patch-584
   Fix admin/quick-install-emacs to work with recent versions of autoconf

 * [email protected]/gnus--rel--5.10--patch-171
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-172
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-173
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-174
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-175
   Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

 * [email protected]/gnus--rel--5.10--patch-176
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-177
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-178
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-179
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-180
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-181
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-182
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-183
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-184
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-185
   Merge from emacs--devo--0

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-590

1 files changed, 12 insertions, 2 deletions

diff --git a/src/config.in b/src/config.in
index 21052474ec..f0ebbc7621 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,7 +1,7 @@
 /* src/config.in.  Generated from configure.in by autoheader.  */
 
 /* GNU Emacs site configuration template file.
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -121,6 +121,10 @@ Boston, MA 02110-1301, USA.  */
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
 
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#undef HAVE_DECL_TZNAME
+
 /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL___SYS_SIGLIST
@@ -245,6 +249,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `gtk_file_selection_new' function. */
 #undef HAVE_GTK_FILE_SELECTION_NEW
 
+/* Define to 1 if you have the `gtk_main' function. */
+#undef HAVE_GTK_MAIN
+
 /* Define to 1 if GTK can handle more than one display. */
 #undef HAVE_GTK_MULTIDISPLAY
 
@@ -571,6 +578,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if `struct utimbuf' is declared by <utime.h>. */
 #undef HAVE_STRUCT_UTIMBUF
 
+/* Define to 1 if you have the `sync' function. */
+#undef HAVE_SYNC
+
 /* Define to 1 if you have the `sysinfo' function. */
 #undef HAVE_SYSINFO
 
@@ -796,7 +806,7 @@ Boston, MA 02110-1301, USA.  */
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */