(FRAME_RIGHT_SCROLL_BAR_WIDTH): New define.

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index 08919a3..4f7a167 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -122,6 +122,19 @@ Goto End
 set djgpp_ver=1\r
 If ErrorLevel 20 set djgpp_ver=2\r
 rm -f junk.c junk junk.exe\r
+rem DJECHO is used by the top-level Makefile\r
+Echo Checking whether 'djecho' is available...\r
+redir -o Nul -eo djecho -o junk.$$$ foo\r
+If Exist junk.$$$ Goto djechoOk\r
+Echo To build 'Emacs' you need the 'djecho.exe' program!\r
+Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.\r
+Echo Versions of DJGPP before 2.02 called this program 'echo.exe'.\r
+Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,\r
+Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.\r
+Echo Then run CONFIG.BAT again with the same arguments you did now.\r
+Goto End\r
+:djechoOk\r
+rm -f junk.$$$\r
 Echo Configuring for DJGPP Version %DJGPP_VER% ...\r
 Rem   ----------------------------------------------------------------------\r
 Echo Configuring the source directory...\r
@@ -149,10 +162,10 @@ rem   Create "makefile" from "makefile.in".
 rm -f Makefile junk.c\r
 sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c\r
 If "%DJGPP_VER%" == "1" Goto mfV1\r
-gcc -E junk.c | sed -f ../msdos/sed1v2.inp >Makefile\r
+gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile\r
 goto mfDone\r
 :mfV1\r
-gcc -E junk.c | sed -f ../msdos/sed1.inp >Makefile\r
+gcc -E -traditional junk.c | sed -f ../msdos/sed1.inp >Makefile\r
 :mfDone\r
 rm -f junk.c\r
 \r
@@ -173,7 +186,7 @@ Echo Configuring the library source directory...
 cd lib-src\r
 rem   Create "makefile" from "makefile.in".\r
 sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c\r
-gcc -E -I. -I../src junk.c | sed -e "s/^ /     /" -e "/^#/d" -e "/^[   \f]*$/d" >makefile.new\r
+gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ /        /" -e "/^#/d" -e "/^[   \f]*$/d" >makefile.new\r
 If "%DJGPP_VER%" == "2" goto libsrc-v2\r
 sed -f ../msdos/sed3.inp <makefile.new >Makefile\r
 Goto libsrc2\r