Rename `MS-DOG' into `MS-DOS'.

[gnu-emacs] / config.bat

diff --git a/config.bat b/config.bat
index 647752443911f9b6c78400d5575f9e2323e62cfc..9a80f5d7854bade9c8787713204fbe8f1e850086 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,7 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r
-rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004\r
+rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004, 2006\r
 rem   Free Software Foundation, Inc.\r
 \r
 rem   This file is part of GNU Emacs.\r
@@ -18,8 +18,8 @@ rem   GNU General Public License for more details.
 \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   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
+rem   Boston, MA 02110-1301, USA.\r
 rem   ----------------------------------------------------------------------\r
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r
@@ -161,8 +161,9 @@ sed -f ../msdos/sed2v2.inp <config.tmp >config.h2
 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\r
-echo int main(void) { return (unsigned long)&foo %% 8; }             >>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
@@ -171,7 +172,7 @@ Echo WARNING: Your GCC does not support 8-byte aligned variables.
 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 DECL_ALIGN(type, var) type var >>config.h2\r
+echo #define NO_DECL_ALIGN >>config.h2\r
 :alignOk\r
 rm -f junk.c junk junk.exe\r
 update config.h2 config.h >nul\r