Fix glitch in scrolling_window (backport from trunk).

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index c007e0c..e1d9f1b 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -2,7 +2,7 @@
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r
 rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003\r
-rem   2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.\r
+rem   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.\r
 \r
 rem   This file is part of GNU Emacs.\r
 \r
@@ -26,8 +26,9 @@ rem   + msdos version 3 or better.
 rem   + DJGPP version 1.12maint1 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.\r
-rem   + rm and mv (from GNU file utilities).\r
+rem     line length limit.  The make that comes with DJGPP does work (and is\r
+rem     recommended).\r
+rem   + rm, mv, and cp (from GNU file utilities).\r
 rem   + sed (you can use the port that comes with DJGPP).\r
 rem\r
 rem   You should be able to get all the above utilities from the DJGPP FTP\r
@@ -36,6 +37,7 @@ rem   ----------------------------------------------------------------------
 set X11=\r
 set nodebug=\r
 set djgpp_ver=\r
+set sys_malloc=\r
 if "%1" == "" goto usage\r
 rem   ----------------------------------------------------------------------\r
 rem   See if their environment is large enough.  We need 28 bytes.\r
@@ -47,8 +49,9 @@ if "%1" == "" goto usage
 if "%1" == "--with-x" goto withx\r
 if "%1" == "--no-debug" goto nodebug\r
 if "%1" == "msdos" goto msdos\r
+if "%1" == "--with-system-malloc" goto sysmalloc\r
 :usage\r
-echo Usage: config [--with-x] [--no-debug] msdos\r
+echo Usage: config [--no-debug] [--with-system-malloc] [--with-x] msdos\r
 echo [Read the script before you run it.]\r
 goto end\r
 rem   ----------------------------------------------------------------------\r
@@ -62,6 +65,11 @@ set nodebug=Y
 shift\r
 goto again\r
 rem   ----------------------------------------------------------------------\r
+:sysmalloc\r
+set sys_malloc=Y\r
+shift\r
+goto again\r
+rem   ----------------------------------------------------------------------\r
 :msdos\r
 Echo Checking whether 'sed' is available...\r
 sed -e "w junk.$$$" <Nul\r
@@ -173,6 +181,13 @@ rem The following line disables DECL_ALIGN which in turn disables USE_LSB_TAG
 rem For details see lisp.h where it defines USE_LSB_TAG\r
 echo #define NO_DECL_ALIGN >>config.h2\r
 :alignOk\r
+Rem See if they requested a SYSTEM_MALLOC build\r
+if "%sys_malloc%" == "" Goto cfgDone\r
+rm -f config.tmp\r
+ren config.h2 config.tmp\r
+sed -f ../msdos/sedalloc.inp <config.tmp >config.h2\r
+\r
+:cfgDone\r
 rm -f junk.c junk junk.exe\r
 update config.h2 config.h >nul\r
 rm -f config.tmp config.h2\r
@@ -234,7 +249,7 @@ mv -f makefile.tmp Makefile
 cd ..\r
 :oldx1\r
 rem   ----------------------------------------------------------------------\r
-Echo Configuring the doc directory...\r
+Echo Configuring the doc directory, expect one "File not found" message...\r
 cd doc\r
 Rem The two variants for lispintro below is for when the shell\r
 Rem supports long file names but DJGPP does not\r
@@ -254,6 +269,8 @@ cd ..
 rem   ----------------------------------------------------------------------\r
 :maindir\r
 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
@@ -281,6 +298,7 @@ set $foo$=
 set X11=\r
 set nodebug=\r
 set djgpp_ver=\r
+set sys_malloc=\r
 \r
 goto skipArchTag\r
    arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33\r