Suggested change to nt\configure.bat

["Lennart Borgman" <lennart.borgman.073@student.lu.se>]

Below are some small changes to nt\configure.bat that I think would make it
more helpful. It checks for more programs that are actually needed during
the build and tells how to get them. It also checks to see if bootstrap is
necessary and tell more in detail how to do the build.

What do you think of such a change? Could this be accepted?

- Lennart

(I am not very familiar with using diff. What switches should be used for
diff to make it useful here?)


diff -c -b -w -B "c:/emacscvs/emacs/nt/configure.bat"
"c:/emacscvs/emacs/nt/configure-new.bat"
*** c:/emacscvs/emacs/nt/configure.bat Sun Oct 17 00:54:35 2004
--- c:/emacscvs/emacs/nt/configure-new.bat Sat Oct 30 23:18:38 2004
***************
*** 194,215 ****
  goto again

  rem ----------------------------------------------------------------------
! rem    Check that necessary utilities (cp and rm) are present.
  :checkutils
  echo Checking for 'cp'...
  cp configure.bat junk.bat
  if not exist junk.bat goto needcp
  echo Checking for 'rm'...
  rm junk.bat
  if exist junk.bat goto needrm
  goto checkcompiler
  :needcp
  echo You need 'cp' (the Unix file copy program) to build Emacs.
! goto end
  :needrm
  del junk.bat
  echo You need 'rm' (the Unix file delete program) to build Emacs.
! goto end

  rem ----------------------------------------------------------------------
  rem   Auto-detect compiler if not specified, and validate GCC if chosen.
--- 194,234 ----
  goto again

  rem ----------------------------------------------------------------------
! rem    Check that necessary utilities are present.
  :checkutils
    echo Checking for 'cp'...
      cp configure.bat junk.bat
      if not exist junk.bat goto needcp
+   echo Checking for 'mv'
+     mv junk.bat junk-mv.bat
+     if not exist junk-mv.bat goto needmv
+     del junk-mv.bat
+   echo Checking for 'touch'...
+     touch junk.bat
+     if not exist junk.bat goto needtouch
    echo Checking for 'rm'...
      rm junk.bat
      if exist junk.bat goto needrm
+   echo Checking for 'makeinfo'...
+     makeinfo --help > /null 2>&1
+     if errorlevel 1 goto needmakeinfo
    goto checkcompiler
+ :needmakeinfo
+   echo You need a working 'makeinfo' (part of TexInfo) to build Emacs.
+   goto TellUtilLoc
+ :needtouch
+   echo You need a working 'touch' (the Unix file touch program) to build
Emacs.
+   goto TellUtilLoc
+ :needmv
+   echo You need 'mv' (the Unix file move program) to build Emacs.
+   goto TellUtilLoc
  :needcp
    echo You need 'cp' (the Unix file copy program) to build Emacs.
!   goto TellUtilLoc
  :needrm
    del junk.bat
    echo You need 'rm' (the Unix file delete program) to build Emacs.
!   goto TellUtilLoc

  rem ----------------------------------------------------------------------
  rem   Auto-detect compiler if not specified, and validate GCC if chosen.
***************
*** 456,469 ****
  if not exist ..\site-lisp\subdirs.el copy subdirs.el
..\site-lisp\subdirs.el

  echo.
  echo Emacs successfully configured.
! echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install.
  goto end

  :SmallEnv
  echo Your environment size is too small.  Please enlarge it and rerun
configure.
  echo For example, type "command.com /e:2048" to have 2048 bytes available.
  set $foo$=
  :end
  set prefix=
  set nodebug=
--- 475,509 ----
  if not exist ..\site-lisp\subdirs.el copy subdirs.el
..\site-lisp\subdirs.el

  echo.
+ echo -----------------------------------------------------
  echo Emacs successfully configured.
! if "%COMPILER%" == "cl" echo Configured to use MSVC cl and nmake
! if "%COMPILER%" == "gcc" echo Configured to use MinGW gcc and GNU Make
! echo -------
! echo Steps to build Emacs:
! @if not EXIST ..\lisp\abbrev.elc echo - Essential Lisp files seem to be
missing.  You should either
! @if not EXIST ..\lisp\abbrev.elc echo   do '%MAKECMD% bootstrap' or create
'..\alisp/abbrev.elc' somehow
! echo - Run `%MAKECMD%' to build
! echo - Run `%MAKECMD% info' to build Emacs info files
! echo - Run `%MAKECMD% install'
! echo    or `%MAKECMD% INSTALL_DIR=c:\emacs\myemacs' to install.
! echo.
! echo Note 1: You may want to use "perl build_sanity.pl to check your
building environment.
! if "%MAKECMD%" == "gmake" echo Note 2: gmake stands for GNU Make and the
file name is normally make.exe
  goto end

+ :TellUtilLoc
+ echo -----------
+ echo You can find unix utilities for W32 on
http://gnuwin32.sourceforge.net/
+ echo Or, you can download MSYS from http://www.mingw.org/
+ echo     or Cygwin from http://www.cygwin.org/
+ goto end:
+
  :SmallEnv
  echo Your environment size is too small.  Please enlarge it and rerun
configure.
  echo For example, type "command.com /e:2048" to have 2048 bytes available.
  set $foo$=
+
  :end
  set prefix=
  set nodebug=

Diff finished at Sat Oct 30 23:31:30