X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b33ba8120b3548a3b95cdea5a9be8982380407fb..7a84eee5b745ad577d414158716ffe2ee487a117:/config.bat
diff --git a/config.bat b/config.bat
index 8f93451d80..f2eb0262e6 100644
--- a/config.bat
+++ b/config.bat
@@ -2,7 +2,7 @@
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
-rem 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+rem 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
@@ -17,7 +17,7 @@ rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
rem GNU General Public License for more details.
rem You should have received a copy of the GNU General Public License
-rem along with GNU Emacs. If not, see .
+rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
rem ----------------------------------------------------------------------
rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
@@ -26,8 +26,9 @@ rem + msdos version 3 or better.
rem + DJGPP version 1.12maint1 or later (version 2.03 or later recommended).
rem + make utility that allows breaking of the 128 chars limit on
rem command lines. ndmake (as of version 4.5) won't work due to a
-rem line length limit. The make that comes with DJGPP does work.
-rem + rm and mv (from GNU file utilities).
+rem line length limit. The make that comes with DJGPP does work (and is
+rem recommended).
+rem + rm, mv, and cp (from GNU file utilities).
rem + sed (you can use the port that comes with DJGPP).
rem
rem You should be able to get all the above utilities from the DJGPP FTP
@@ -36,6 +37,7 @@ rem ----------------------------------------------------------------------
set X11=
set nodebug=
set djgpp_ver=
+set sys_malloc=
if "%1" == "" goto usage
rem ----------------------------------------------------------------------
rem See if their environment is large enough. We need 28 bytes.
@@ -47,8 +49,9 @@ if "%1" == "" goto usage
if "%1" == "--with-x" goto withx
if "%1" == "--no-debug" goto nodebug
if "%1" == "msdos" goto msdos
+if "%1" == "--with-system-malloc" goto sysmalloc
:usage
-echo Usage: config [--with-x] [--no-debug] msdos
+echo Usage: config [--no-debug] [--with-system-malloc] [--with-x] msdos
echo [Read the script before you run it.]
goto end
rem ----------------------------------------------------------------------
@@ -62,6 +65,11 @@ set nodebug=Y
shift
goto again
rem ----------------------------------------------------------------------
+:sysmalloc
+set sys_malloc=Y
+shift
+goto again
+rem ----------------------------------------------------------------------
:msdos
Echo Checking whether 'sed' is available...
sed -e "w junk.$$$" >config.h2
:alignOk
+Rem See if they requested a SYSTEM_MALLOC build
+if "%sys_malloc%" == "" Goto cfgDone
+rm -f config.tmp
+ren config.h2 config.tmp
+sed -f ../msdos/sedalloc.inp config.h2
+
+:cfgDone
rm -f junk.c junk junk.exe
update config.h2 config.h >nul
rm -f config.tmp config.h2
@@ -234,7 +249,7 @@ mv -f makefile.tmp Makefile
cd ..
:oldx1
rem ----------------------------------------------------------------------
-Echo Configuring the doc directory...
+Echo Configuring the doc directory, expect one "File not found" message...
cd doc
Rem The two variants for lispintro below is for when the shell
Rem supports long file names but DJGPP does not
@@ -254,6 +269,8 @@ cd ..
rem ----------------------------------------------------------------------
:maindir
Echo Configuring the main directory...
+If Exist .dir-locals.el update .dir-locals.el _dir-locals.el
+If Exist src\.dbxinit update src/.dbxinit src/_dbxinit
If "%DJGPP_VER%" == "1" goto mainv1
Echo Looking for the GDB init file...
If Exist src\.gdbinit update src/.gdbinit src/_gdbinit
@@ -281,6 +298,7 @@ set $foo$=
set X11=
set nodebug=
set djgpp_ver=
+set sys_malloc=
goto skipArchTag
arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33