X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/efb81423f8fd8a26c721e977007af01f569eb7f8..9f5348e3c86479224dd9f9217fa4a728e0083d36:/config.bat

diff --git a/config.bat b/config.bat
index 6bfd818953..5d9f7718c7 100644
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,8 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MSDOS
-rem   Copyright (C) 1994 Free Software Foundation, Inc.
+rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001
+rem   Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
@@ -122,6 +123,19 @@ Goto End
 set djgpp_ver=1
 If ErrorLevel 20 set djgpp_ver=2
 rm -f junk.c junk junk.exe
+rem DJECHO is used by the top-level Makefile
+Echo Checking whether 'djecho' is available...
+redir -o Nul -eo djecho -o junk.$$$ foo
+If Exist junk.$$$ Goto djechoOk
+Echo To build 'Emacs' you need the 'djecho.exe' program!
+Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.
+Echo Versions of DJGPP before 2.02 called this program 'echo.exe'.
+Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,
+Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.
+Echo Then run CONFIG.BAT again with the same arguments you did now.
+Goto End
+:djechoOk
+rm -f junk.$$$
 Echo Configuring for DJGPP Version %DJGPP_VER% ...
 Rem   ----------------------------------------------------------------------
 Echo Configuring the source directory...
@@ -138,7 +152,12 @@ sed -e '' config.in > config.tmp
 if "%X11%" == "" goto src4
 sed -f ../msdos/sed2x.inp <config.in >config.tmp
 :src4
+if "%DJGPP_VER%" == "2" Goto src41
 sed -f ../msdos/sed2.inp <config.tmp >config.h2
+goto src42
+:src41
+sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
+:src42
 update config.h2 config.h >nul
 rm -f config.tmp config.h2
 
@@ -149,10 +168,10 @@ rem   Create "makefile" from "makefile.in".
 rm -f Makefile junk.c
 sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c
 If "%DJGPP_VER%" == "1" Goto mfV1
-gcc -E junk.c | sed -f ../msdos/sed1v2.inp >Makefile
+gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile
 goto mfDone
 :mfV1
-gcc -E junk.c | sed -f ../msdos/sed1.inp >Makefile
+gcc -E -traditional junk.c | sed -f ../msdos/sed1.inp >Makefile
 :mfDone
 rm -f junk.c
 
@@ -173,7 +192,7 @@ Echo Configuring the library source directory...
 cd lib-src
 rem   Create "makefile" from "makefile.in".
 sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c
-gcc -E -I. -I../src junk.c | sed -e "s/^ /	/" -e "/^#/d" -e "/^[ 	]*$/d" >makefile.new
+gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ /	/" -e "/^#/d" -e "/^[ 	]*$/d" >makefile.new
 If "%DJGPP_VER%" == "2" goto libsrc-v2
 sed -f ../msdos/sed3.inp <makefile.new >Makefile
 Goto libsrc2
@@ -204,6 +223,19 @@ cd man
 sed -f ../msdos/sed6.inp < Makefile.in > Makefile
 cd ..
 rem   ----------------------------------------------------------------------
+Echo Configuring the ELisp manual directory...
+cd lispref
+sed -f ../msdos/sed6.inp < Makefile.in > Makefile
+cd ..
+rem   ----------------------------------------------------------------------
+Echo Configuring the ELisp Introduction manual directory...
+Rem The two variants for the line below is for when the shell
+Rem supports long file names but DJGPP does not
+if exist lispintro\Makefile.in cd lispintro
+if exist lispintr\Makefile.in cd lispintr
+sed -f ../msdos/sed6.inp < Makefile.in > Makefile
+cd ..
+rem   ----------------------------------------------------------------------
 Echo Configuring the lisp directory...
 cd lisp
 sed -f ../msdos/sedlisp.inp < Makefile.in > Makefile
@@ -219,7 +251,7 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the main directory...
 If "%DJGPP_VER%" == "1" goto mainv1
 Echo Looking for the GDB init file...
-If not Exist src\_gdbinit If Exist src\.gdbinit update src/.gdbinit src/_gdbinit
+If Exist src\.gdbinit update src/.gdbinit src/_gdbinit
 If Exist src\_gdbinit goto gdbinitOk
 Echo ERROR:
 Echo I cannot find the GDB init file.  It was called ".gdbinit" in