Switch to recommended form of GPLv3 permissions notice.

[bpt/emacs.git] / nt / configure.bat

diff --git a/nt/configure.bat b/nt/configure.bat
index 87b02de..ff47f03 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -24,11 +24,11 @@ rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r
 rem   + MS Windows 95/98/Me or NT/2000/XP\r
-rem   + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75\r
+rem   + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75\r
 rem     or later) and the Mingw32 and W32 API headers and libraries.\r
 rem   + Visual Studio 2005 is not supported at this time.\r
 rem\r
-rem For reference, here is a list of which builds of gmake are known to\r
+rem For reference, here is a list of which builds of GNU make are known to\r
 rem work or not, and whether they work in the presence and/or absence of\r
 rem sh.exe.\r
 rem\r
@@ -282,9 +282,11 @@ rem   are like this), or have a typo in the definition of
 rem   IMAGE_FIRST_SECTION (the headers with gcc/mingw32 2.95 have this\r
 rem   problem).  The gcc/mingw32 2.95.2 headers are okay, as are distros\r
 rem   of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.\r
+rem   Beginning with Emacs 23, we need usp10.h.\r
 rem\r
 echo Checking whether W32 API headers are too old...\r
 echo #include "windows.h" >junk.c\r
+echo #include "usp10.h" >>junk.c\r
 echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c\r
 echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c\r
 if (%nocygwin%) == (Y) goto chkapi1\r
@@ -599,6 +601,7 @@ goto end
 :success\r
 echo Emacs successfully configured.\r
 echo Emacs successfully configured. >>config.log\r
+if (%MAKECMD%) == (gmake) set MAKECMD=make\r
 echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install.\r
 goto end\r
 \r