* building.texi (GDB Graphical Interface): Remove misleading comparison

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index cd3e8e2..f2eb026 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -1,15 +1,15 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r

-rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001\r
-rem   Free Software Foundation, Inc.\r
+rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003\r
+rem   2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.\r

 \r
 rem   This file is part of GNU Emacs.\r
 \r
 \r
 rem   This file is part of GNU Emacs.\r
 \r

-rem   GNU Emacs is free software; you can redistribute it and/or modify\r
+rem   GNU Emacs is free software: you can redistribute it and/or modify\r

 rem   it under the terms of the GNU General Public License as published by\r
 rem   it under the terms of the GNU General Public License as published by\r

-rem   the Free Software Foundation; either version 2, or (at your option)\r
-rem   any later version.\r
+rem   the Free Software Foundation, either version 3 of the License, or\r
+rem   (at your option) any later version.\r

 \r
 rem   GNU Emacs is distributed in the hope that it will be useful,\r
 rem   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 \r
 rem   GNU Emacs is distributed in the hope that it will be useful,\r
 rem   but WITHOUT ANY WARRANTY; without even the implied warranty of\r


@@ -17,28 +17,27 @@ rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 rem   GNU General Public License for more details.\r
 \r
 rem   You should have received a copy of the GNU General Public License\r
 rem   GNU General Public License for more details.\r
 \r
 rem   You should have received a copy of the GNU General Public License\r

-rem   along with GNU Emacs; see the file COPYING.  If not, write to the\r
-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
-rem   Boston, MA 02111-1307, USA.\r
+rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
+\r

 rem   ----------------------------------------------------------------------\r
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r
 rem   + msdos version 3 or better.\r
 rem   ----------------------------------------------------------------------\r
 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.0 or later recommended).\r
+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   + 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   + 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 any SimTel\r
-rem   repository, e.g. ftp.simtel.net, in the directory\r
-rem   "pub/simtelnet/gnu/djgpp/v2gnu".  As usual, please use your local\r
-rem   mirroring site to reduce trans-Atlantic traffic.\r
+rem   You should be able to get all the above utilities from the DJGPP FTP\r
+rem   site, ftp.delorie.com, in the directory "pub/djgpp/current/v2gnu".\r

 rem   ----------------------------------------------------------------------\r
 set X11=\r
 set nodebug=\r
 set djgpp_ver=\r
 rem   ----------------------------------------------------------------------\r
 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
 if "%1" == "" goto usage\r
 rem   ----------------------------------------------------------------------\r
 rem   See if their environment is large enough.  We need 28 bytes.\r


@@ -50,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-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
 :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
 echo [Read the script before you run it.]\r
 goto end\r
 rem   ----------------------------------------------------------------------\r


@@ -65,6 +65,11 @@ set nodebug=Y
 shift\r
 goto again\r
 rem   ----------------------------------------------------------------------\r
 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
 :msdos\r
 Echo Checking whether 'sed' is available...\r
 sed -e "w junk.$$$" <Nul\r


@@ -123,7 +128,9 @@ Goto End
 set djgpp_ver=1\r
 If ErrorLevel 20 set djgpp_ver=2\r
 rm -f junk.c junk junk.exe\r
 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
+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
 If Exist junk.$$$ Goto djechoOk\r
 Echo Checking whether 'djecho' is available...\r
 redir -o Nul -eo djecho -o junk.$$$ foo\r
 If Exist junk.$$$ Goto djechoOk\r


@@ -152,7 +159,36 @@ sed -e '' config.in > config.tmp
 if "%X11%" == "" goto src4\r
 sed -f ../msdos/sed2x.inp <config.in >config.tmp\r
 :src4\r
 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
 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
+rem Two percent signs because it is a special character for COMMAND.COM/CMD\r
+rem Filter thru Sed because "&" is special for CMD.EXE\r
+echo int main(void) { return (unsigned long)"&"foo %% 8; } | sed "s/.&./\&/"         >>junk.c\r
+gcc -o junk junk.c\r
+if not exist junk.exe coff2exe junk\r
+junk\r
+If Not ErrorLevel 1 Goto alignOk\r
+Echo WARNING: Your GCC does not support 8-byte aligned variables.\r
+Echo WARNING: Therefore Emacs cannot support buffers larger than 128MB.\r
+rem The following line disables DECL_ALIGN which in turn disables USE_LSB_TAG\r
+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
 \r
 update config.h2 config.h >nul\r
 rm -f config.tmp config.h2\r
 \r


@@ -186,7 +222,7 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...\r
 cd lib-src\r
 rem   Create "makefile" from "makefile.in".\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
+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
 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


@@ -213,14 +249,11 @@ mv -f makefile.tmp Makefile
 cd ..\r
 :oldx1\r
 rem   ----------------------------------------------------------------------\r
 cd ..\r
 :oldx1\r
 rem   ----------------------------------------------------------------------\r

-Echo Configuring the manual directory...\r
-cd man\r
-sed -f ../msdos/sed6.inp < Makefile.in > Makefile\r
-cd ..\r
-rem   ----------------------------------------------------------------------\r
-Echo Configuring the ELisp manual directory...\r
-cd lispref\r
-sed -f ../msdos/sed6.inp < Makefile.in > Makefile\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
+for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp < %%d\Makefile.in > %%d\Makefile\r

 cd ..\r
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the lisp directory...\r
 cd ..\r
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the lisp directory...\r


@@ -236,6 +269,8 @@ cd ..
 rem   ----------------------------------------------------------------------\r
 :maindir\r
 Echo Configuring the main directory...\r
 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
 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


@@ -263,3 +298,8 @@ set $foo$=
 set X11=\r
 set nodebug=\r
 set djgpp_ver=\r
 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
+:skipArchTag\r