Checking in the correct versions of the files, sorry, I hade used the files

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index 6477524..2faa655 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -1,15 +1,15 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r
-rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004\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  Free Software Foundation, Inc.\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   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
@@ -17,9 +17,8 @@ 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   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
@@ -161,8 +160,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 +171,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
@@ -234,22 +234,11 @@ mv -f makefile.tmp Makefile
 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
-cd ..\r
-rem   ----------------------------------------------------------------------\r
-Echo Configuring the ELisp Introduction manual directory...\r
-Rem The two variants for the line below is for when the shell\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
-if exist lispintro\Makefile.in cd lispintro\r
-if exist lispintr\Makefile.in cd lispintr\r
-sed -f ../msdos/sed6.inp < Makefile.in > Makefile\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