*** empty log message ***

[gnu-emacs] / config.bat

diff --git a/config.bat b/config.bat
index f5e73928a9d3530c068559b2b5272ffc97e4e51e..4f7a167c6bb4dbb7dd0c8f906641fef621a7e45b 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
@@ -147,12 +160,12 @@ if exist dir.h ren dir.h vmsdir.h
 \r
 rem   Create "makefile" from "makefile.in".\r
 rm -f Makefile junk.c\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >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
@@ -163,7 +176,7 @@ rm -f makefile.tmp
 :src5\r
 \r
 if "%nodebug%" == "" goto src6\r
-sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :src6\r
@@ -172,8 +185,8 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...\r
 cd lib-src\r
 rem   Create "makefile" from "makefile.in".\r
-sed -e "1,/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
+sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c\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
@@ -182,7 +195,7 @@ sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
 :libsrc2\r
 rm -f makefile.new junk.c\r
 if "%nodebug%" == "" goto libsrc3\r
-sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :libsrc3\r
@@ -193,7 +206,7 @@ Echo Configuring the oldxmenu directory...
 cd oldxmenu\r
 sed -f ../msdos/sed5x.inp <Makefile.in >Makefile\r
 if "%nodebug%" == "" goto oldx2\r
-sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 mv -f makefile.tmp Makefile\r
 :oldx2\r
 cd ..\r
@@ -204,6 +217,11 @@ cd man
 sed -f ../msdos/sed6.inp < Makefile.in > Makefile\r
 cd ..\r
 rem   ----------------------------------------------------------------------\r
+Echo Configuring the lisp directory...\r
+cd lisp\r
+sed -f ../msdos/sedlisp.inp < Makefile.in > Makefile\r
+cd ..\r
+rem   ----------------------------------------------------------------------\r
 If not Exist leim\quail\latin-pre.el goto maindir\r
 Echo Configuring the leim directory...\r
 cd leim\r
@@ -214,7 +232,7 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the main directory...\r
 If "%DJGPP_VER%" == "1" goto mainv1\r
 Echo Looking for the GDB init file...\r
-If not Exist src\_gdbinit If Exist src\.gdbinit update src/.gdbinit src/_gdbinit\r
+If Exist src\.gdbinit update src/.gdbinit src/_gdbinit\r
 If Exist src\_gdbinit goto gdbinitOk\r
 Echo ERROR:\r
 Echo I cannot find the GDB init file.  It was called ".gdbinit" in\r