Define some malloc objects with configure, not cpp.

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index 271673b..35fef44 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -23,7 +23,7 @@ rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r
 rem   + msdos version 3 or better.\r
-rem   + DJGPP version 1.12maint1 or later (version 2.03 or later recommended).\r
+rem   + DJGPP version 2.0 or later (version 2.03 or later recommended).\r
 rem   + make utility that allows breaking of the 128 chars limit on\r
 rem     command lines.  ndmake (as of version 4.5) won't work due to a\r
 rem     line length limit.  The make that comes with DJGPP does work (and is\r
@@ -125,11 +125,10 @@ rm -f junk.c junk junk.exe
 Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!\r
 Goto End\r
 :go32Ok\r
-set djgpp_ver=1\r
-If ErrorLevel 20 set djgpp_ver=2\r
+set djgpp_ver=2\r
+If Not ErrorLevel 20 Echo To build 'Emacs' you need DJGPP v2.0 or later!\r
+If Not ErrorLevel 20 Goto End\r
 rm -f junk.c junk junk.exe\r
-rem The v1.x build does not need djecho\r
-if "%DJGPP_VER%" == "1" Goto djechoOk\r
 rem DJECHO is used by the top-level Makefile in the v2.x build\r
 Echo Checking whether 'djecho' is available...\r
 redir -o Nul -eo djecho -o junk.$$$ foo\r
@@ -159,12 +158,7 @@ sed -e '' config.in > config.tmp
 if "%X11%" == "" goto src4\r
 sed -f ../msdos/sed2x.inp <config.in >config.tmp\r
 :src4\r
-if "%DJGPP_VER%" == "2" Goto src41\r
-sed -f ../msdos/sed2.inp <config.tmp >config.h2\r
-goto src42\r
-:src41\r
 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2\r
-:src42\r
 Rem See if DECL_ALIGN can be supported with this GCC\r
 rm -f junk.c junk.o junk junk.exe\r
 echo struct { int i; char *p; } __attribute__((__aligned__(8))) foo;  >junk.c\r
@@ -198,12 +192,7 @@ if exist dir.h ren dir.h vmsdir.h
 rem   Create "makefile" from "makefile.in".\r
 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 -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile\r
-goto mfDone\r
-:mfV1\r
-gcc -E -traditional junk.c | sed -f ../msdos/sed1.inp >Makefile\r
-:mfDone\r
 rm -f junk.c\r
 \r
 if "%X11%" == "" goto src5\r
@@ -212,6 +201,12 @@ sed -f ../msdos/sed1x.inp <makefile.tmp >Makefile
 rm -f makefile.tmp\r
 :src5\r
 \r
+if "%sys_malloc%" == "" goto src5a\r
+sed -e "/^GMALLOC_OBJ *=/s/gmalloc.o//" <Makefile >makefile.tmp\r
+sed -e "/^VMLIMIT_OBJ *=/s/vm-limit.o//" <makefile.tmp >Makefile\r
+rm -f makefile.tmp\r
+:src5a\r
+\r
 if "%nodebug%" == "" goto src6\r
 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile\r
@@ -221,16 +216,12 @@ cd ..
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the library source directory...\r
 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 -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
-:libsrc-v2\r
-sed -f ../msdos/sed3v2.inp <makefile.new >Makefile\r
-:libsrc2\r
-rm -f makefile.new junk.c\r
+sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile\r
+if "%X11%" == "" goto libsrc2a\r
+mv Makefile makefile.tmp\r
+sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile\r
+rm -f makefile.tmp\r
+:libsrc2a\r
 if "%nodebug%" == "" goto libsrc3\r
 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile\r
@@ -271,7 +262,6 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the main directory...\r
 If Exist .dir-locals.el update .dir-locals.el _dir-locals.el\r
 If Exist src\.dbxinit update src/.dbxinit src/_dbxinit\r
-If "%DJGPP_VER%" == "1" goto mainv1\r
 Echo Looking for the GDB init file...\r
 If Exist src\.gdbinit update src/.gdbinit src/_gdbinit\r
 If Exist src\_gdbinit goto gdbinitOk\r
@@ -286,8 +276,6 @@ goto End
 :gdbinitOk\r
 Echo Looking for the GDB init file...found\r
 copy msdos\mainmake.v2 Makefile >nul\r
-:mainv1\r
-If "%DJGPP_VER%" == "1" copy msdos\mainmake Makefile >nul\r
 rem   ----------------------------------------------------------------------\r
 goto End\r
 :SmallEnv\r