nt/configure.bat: Cosmetic changes.

diff --git a/nt/configure.bat b/nt/configure.bat
index c7bfad35189f004090b2641af625bcb2673c0fca..74c7e1af137ca6902cc7bd0b30115d1f828495e6 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,6 +1,6 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
-rem   Configuration script for MS Windows 95/98/Me and NT/2000/XP\r
+rem   Configuration script for MS Windows operating systems\r
 rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,\r
 rem      2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.\r
 \r
@@ -22,7 +22,7 @@ rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
 rem   ----------------------------------------------------------------------\r
 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   + MS Windows 95, NT or later\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
@@ -116,6 +116,7 @@ if "%1" == "--without-xpm" goto withoutxpm
 if "%1" == "--with-svg" goto withsvg\r
 if "%1" == "--distfiles" goto distfiles\r
 if "%1" == "" goto checkutils\r
+\r
 :usage\r
 echo Usage: configure [options]\r
 echo Options:\r
@@ -137,61 +138,82 @@ echo.   --without-xpm           do not use XPM library even if it is installed
 echo.   --with-svg              use the RSVG library (experimental)\r
 echo.   --distfiles             path to files for make dist, e.g. libXpm.dll\r
 goto end\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :setprefix\r
 shift\r
 set prefix=%1\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :withgcc\r
 set COMPILER=gcc\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :withmsvc\r
 set COMPILER=cl\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :nodebug\r
 set nodebug=Y\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :noopt\r
 set noopt=Y\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :enablechecking\r
 set enablechecking=Y\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :profile\r
 set profile=Y\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :nocygwin\r
 set nocygwin=Y\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :usercflags\r
 shift\r
 set usercflags=%usercflags%%sep1%%1\r
 set sep1= %nothing%\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
+\r
 :userldflags\r
 shift\r
 set userldflags=%userldflags%%sep2%%1\r
 set sep2= %nothing%\r
 shift\r
 goto again\r
+\r
 rem ----------------------------------------------------------------------\r
 \r
 :withoutpng\r
@@ -249,6 +271,7 @@ goto again
 \r
 rem ----------------------------------------------------------------------\r
 rem    Check that necessary utilities (cp and rm) are present.\r
+\r
 :checkutils\r
 echo Checking for 'cp'...\r
 cp configure.bat junk.bat\r
@@ -257,9 +280,11 @@ echo Checking for 'rm'...
 rm junk.bat\r
 if exist junk.bat goto needrm\r
 goto checkcompiler\r
+\r
 :needcp\r
 echo You need 'cp' (the Unix file copy program) to build Emacs.\r
 goto end\r
+\r
 :needrm\r
 del junk.bat\r
 echo You need 'rm' (the Unix file delete program) to build Emacs.\r
@@ -267,6 +292,7 @@ goto end
 \r
 rem ----------------------------------------------------------------------\r
 rem   Auto-detect compiler if not specified, and validate GCC if chosen.\r
+\r
 :checkcompiler\r
 if (%COMPILER%)==(cl) goto compilercheckdone\r
 if (%COMPILER%)==(gcc) goto checkgcc\r
@@ -301,6 +327,7 @@ if exist junk.o set nocygwin=Y
 :chkapi\r
 echo The failed program was: >>config.log\r
 type junk.c >>config.log\r
+\r
 :chkapiN\r
 rm -f junk.c junk.o\r
 rem ----------------------------------------------------------------------\r
@@ -320,8 +347,10 @@ echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c
 if (%nocygwin%) == (Y) goto chkapi1\r
 set cf=%usercflags%\r
 goto chkapi2\r
+\r
 :chkapi1\r
 set cf=%usercflags% -mno-cygwin\r
+\r
 :chkapi2\r
 echo on\r
 gcc %cf% -c junk.c\r
@@ -357,10 +386,12 @@ type junk.c >>config.log
 set mf=-mcpu=i686\r
 rm -f junk.c junk.o\r
 goto gccdebug\r
+\r
 :gccMtuneOk\r
 echo GCC supports -mtune=pentium4 >>config.log\r
 set mf=-mtune=pentium4\r
 rm -f junk.c junk.o\r
+\r
 :gccdebug\r
 rem Check for DWARF-2 debug info support, else default to stabs\r
 echo main(){} >junk.c\r
@@ -372,6 +403,7 @@ type junk.c >>config.log
 set dbginfo=-gstabs+\r
 rm -f junk.c junk.o\r
 goto compilercheckdone\r
+\r
 :gccdwarf\r
 echo GCC supports DWARF-2 >>config.log\r
 set dbginfo=-gdwarf-2 -g3\r
@@ -565,6 +597,7 @@ goto :distfilesDone
 set fileNotFound=\r
 \r
 rem ----------------------------------------------------------------------\r
+\r
 :genmakefiles\r
 echo Generating makefiles\r
 if %COMPILER% == gcc set MAKECMD=gmake\r
@@ -619,6 +652,7 @@ fc /b config.tmp ..\src\config.h >nul 2>&1
 if errorlevel 1 goto doCopy\r
 fc /b paths.h ..\src\epaths.h >nul 2>&1\r
 if errorlevel 0 goto dontCopy\r
+\r
 :doCopy\r
 copy config.tmp ..\src\config.h\r
 copy paths.h ..\src\epaths.h\r
@@ -648,6 +682,7 @@ fc /b foo.bar foo.bar >nul 2>&1
 if not errorlevel 2 goto doUpdateSubdirs\r
 fc /b subdirs.el ..\site-lisp\subdirs.el >nul 2>&1\r
 if not errorlevel 1 goto dontUpdateSubdirs\r
+\r
 :doUpdateSubdirs\r
 if exist ..\site-lisp\subdirs.el del ..\site-lisp\subdirs.el\r
 copy subdirs.el ..\site-lisp\subdirs.el\r
@@ -716,6 +751,7 @@ goto end
 echo Your environment size is too small.  Please enlarge it and rerun configure.\r
 echo For example, type "command.com /e:2048" to have 2048 bytes available.\r
 set $foo$=\r
+\r
 :end\r
 set prefix=\r
 set nodebug=\r