Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-536
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-537
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-538
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-539
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-540
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-541
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-542
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-543
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-544
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-545
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-546
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-547
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-548
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-549
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-550
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-551
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-552
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-553
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-554
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-555
   erc-iswitchb: Temporarily enable iswitchb mode

 * emacs@sv.gnu.org/emacs--devo--0--patch-556
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-557
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-558
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-559
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-560
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-561
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-562
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-563
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-564
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-565
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-566
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-567
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-568
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-569
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-570
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-571
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-572
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-573
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-574
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-575
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-576
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-577
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-578
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-579
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-580
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-581
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-582
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-583
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-584
   Fix admin/quick-install-emacs to work with recent versions of autoconf

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-171
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-172
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-173
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-174
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-175
   Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-176
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-177
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-178
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-179
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-180
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-181
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-182
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-183
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-184
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-185
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-590

1 files changed, 19 insertions, 8 deletions

diff --git a/nt/configure.bat b/nt/configure.bat
index ffc11542ce0..1e411e8ad2c 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -25,27 +25,38 @@ rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem

 rem   + MS Windows 95/98/Me or NT/2000/XP

 rem   + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75

-rem     or later) and the Mingw32 and W32 API headers and libraries

+rem     or later) and the Mingw32 and W32 API headers and libraries.

+rem   + Visual Studio 2005 is not supported at this time.

 rem

 rem For reference, here is a list of which builds of gmake are known to

 rem work or not, and whether they work in the presence and/or absence of

 rem sh.exe.

 rem

 rem                                       sh exists     no sh

-rem  cygwin b20.1 make (3.75):            okay[1]       fails[2]

+rem  cygwin b20.1 make (3.75):            fails[1,5]    fails[2,5]

 rem  MSVC compiled gmake 3.77:            okay          okay

 rem  MSVC compiled gmake 3.78.1:          okay          okay

 rem  MSVC compiled gmake 3.79.1:          okay          okay

-rem  mingw32/gcc-2.92.2 make (3.77):      okay          okay

-rem  cygwin compiled gmake 3.77:          okay[1]       fails[2]

-rem  cygwin compiled gmake 3.78.1:        okay          fails[2]

-rem  cygwin compiled gmake 3.79.1:        couldn't build make[3]

+rem  mingw32/gcc-2.92.2 make (3.77):      okay          okay[4]

+rem  cygwin compiled gmake 3.77:          fails[1,5]    fails[2,5]

+rem  cygwin compiled gmake 3.78.1:        fails[5]      fails[2,5]

+rem  cygwin compiled gmake 3.79.1:        fails[3,5]    fails[2?,5]

+rem  cygwin compiled make 3.80:           fails?[6]     fails?[6]

+rem  cygwin compiled make 3.81:           fails         fails?[6]

+rem  mingw32 compiled make 3.79.1:        okay          okay

+rem  mingw32 compiled make 3.80:          okay          okay?[6]

+rem  mingw32 compiled make 3.81:          okay          okay[7]

 rem

 rem [1] doesn't cope with makefiles with DOS line endings, so must mount

 rem     emacs source with text!=binary.

 rem [2] fails when needs to invoke shell commands; okay invoking gcc etc.

-rem [3] requires LC_MESSAGES support to build; maybe 2.95.x update to

-rem     cygwin provides this?

+rem [3] requires LC_MESSAGES support to build; cannot build with early

+rem     versions of cygwin.

+rem [4] may fail on Windows 9X and Windows ME; if so, install Bash.

+rem [5] fails when building leim due to the use of cygwin style paths.

+rem     May work if building emacs without leim.

+rem [6] not recommended; please report if you try this combination.

+rem [7] tested only on Windows XP.

 rem

 

 if exist config.log del config.log