* src/getargs.c (flags_argmatch): Don't cause segmentation fault for

[bison.git] / djgpp / config.bat

diff --git a/djgpp/config.bat b/djgpp/config.bat
index df9e508c1385a9ae4017febe853c16d351d85eb5..05c2ba2c218d85f6c366d52af2ef08a52bd3364c 100644 (file)
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -1,5 +1,26 @@
 @echo off\r
-echo Configuring GNU Bison for DJGPP v2.x...\r
+Rem Configure Bison for DJGPP.\r
+\r
+Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line\r
+Rem format, or else stock DOS/Windows shells will refuse to run it.\r
+\r
+Rem Copyright (C) 2005, 2006 Free Software Foundation, Inc.\r
+\r
+Rem This program 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
+\r
+Rem This program is distributed in the hope that it will be useful,\r
+Rem but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\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 this program; if not, write to the Free Software Foundation,\r
+Rem Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r
+\r
+echo Configuring Bison for DJGPP v2.x...\r
 \r
 Rem The SmallEnv tests protect against fixed and too small size\r
 Rem of the environment in stock DOS shell.\r
@@ -136,6 +157,9 @@ if not "%ARGS%" == ""                    echo %ARGS% >> arguments
 set ARGS=\r
 set CACHING=\r
 set DEPENDENCY_TRACKING=\r
+set LIBICONV_PREFIX=\r
+set LIBINTL_PREFIX=\r
+set HTML=\r
 \r
 if "%XSRC%" == "." goto InPlace\r
 \r
@@ -161,15 +185,38 @@ test -f %XSRC%/po/Makefile.in.in
 if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in\r
 test -f %XSRC%/po/Makefile.in-in\r
 if errorlevel 1 mv -f %XSRC%/po/Makefile.in %XSRC%/po/Makefile.in-in\r
+test -f %XSRC%/po/Makefile.in-in\r
+if errorlevel 1 mv -f %XSRC%/po/Makefile.inin %XSRC%/po/Makefile.in-in\r
+test -f %XSRC%/po/Makefile.in-in\r
+if errorlevel 1 mv -f %XSRC%/po/Makefile.in_in %XSRC%/po/Makefile.in-in\r
+test -f %XSRC%/po/Makefile.in-in\r
+if errorlevel 1 mv -f %XSRC%/po/Makefile_in.in %XSRC%/po/Makefile.in-in\r
 test -f %XSRC%/runtime-po/Makefile.in.in\r
 if not errorlevel 1 mv -f %XSRC%/runtime-po/Makefile.in.in %XSRC%/runtime-po/Makefile.in-in\r
 test -f %XSRC%/runtime-po/Makefile.in-in\r
 if errorlevel 1 mv -f %XSRC%/runtime-po/Makefile.in %XSRC%/runtime-po/Makefile.in-in\r
+test -f %XSRC%/runtime-po/Makefile.in-in\r
+if errorlevel 1 mv -f %XSRC%/runtime-po/Makefile.inin %XSRC%/runtime-po/Makefile.in-in\r
+test -f %XSRC%/runtime-po/Makefile.in-in\r
+if errorlevel 1 mv -f %XSRC%/runtime-po/Makefile.in_in %XSRC%/runtime-po/Makefile.in-in\r
+test -f %XSRC%/runtime-po/Makefile.in-in\r
+if errorlevel 1 mv -f %XSRC%/runtime-po/Makefile_in.in %XSRC%/runtime-po/Makefile.in-in\r
 test -f %XSRC%/data/c++.m4\r
 if not errorlevel 1 mv -f %XSRC%/data/c++.m4 %XSRC%/data/cxx.m4\r
 test -f %XSRC%/data/cxx.m4\r
 if errorlevel 1 mv -f %XSRC%/data/cpp.m4 %XSRC%/data/cxx.m4\r
-\r
+:scan_gram_c_Test\r
+test -f %XSRC%/src/c-scan-gram.c\r
+if not errorlevel 1 goto scan_skel_c_Test\r
+test -f %XSRC%/src/scan-gram-c.c\r
+if not errorlevel 1 mv -f %XSRC%/src/scan-gram-c.c %XSRC%/src/c-scan-gram.c\r
+:scan_skel_c_Test\r
+test -f %XSRC%/src/c-scan-skel.c\r
+if not errorlevel 1 goto FixFiles\r
+test -f %XSRC%/src/scan-skel-c.c\r
+if not errorlevel 1 mv -f %XSRC%/src/scan-skel-c.c %XSRC%/src/c-scan-skel.c\r
+\r
+:FixFiles\r
 Rem Fix data/lalr1.cc and data/location.cc to reflect the renaming of c++.m4\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/lalr1.cc > lalr1.cc\r
 if errorlevel 1 goto lalr1_ccFileError\r
@@ -177,14 +224,17 @@ mv ./lalr1.cc %XSRC%/data/lalr1.cc
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/location.cc > location.cc\r
 if errorlevel 1 goto location.ccFileError\r
 mv ./location.cc %XSRC%/data/location.cc\r
+sed "s/c++\.m4/cxx.m4/" %XSRC%/data/glr.cc > glr.cc\r
+if errorlevel 1 goto glr.ccFileError\r
+mv ./glr.cc %XSRC%/data/glr.cc\r
 \r
 Rem Define DJGPP specific defs in config.hin\r
 echo Editing config.hin...\r
-test -f %XSRC%/config_h.orig\r
-if errorlevel 1 update %XSRC%/config.hin %XSRC%/config_h.orig\r
-sed -f %XSRC%/djgpp/config_h.sed %XSRC%/config_h.orig > config.hin\r
+test -f %XSRC%/lib/config_h.orig\r
+if errorlevel 1 update %XSRC%/lib/config.hin %XSRC%/lib/config_h.orig\r
+sed -f %XSRC%/djgpp/config_h.sed %XSRC%/lib/config_h.orig > config.hin\r
 if errorlevel 1 goto SedError2\r
-mv -f config.hin %XSRC%/config.hin\r
+mv -f config.hin %XSRC%/lib/config.hin\r
 \r
 \r
 Rem Fixing ilicit testsuite file name.\r
@@ -234,28 +284,28 @@ test -f %XSRC%/examples/calcxx/calcxx.cc
 if errorlevel 1 mv -f %XSRC%/examples/calcxx/calcpp.cc %XSRC%/examples/calcxx/calcxx.cc\r
 \r
 Rem Fixing #include lines in calcxx files.\r
-sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx.cc > calcxx.cc\r
+sed "/#[        ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx.cc > calcxx.cc\r
 if errorlevel 1 goto calcxxFileError\r
 mv ./calcxx.cc %XSRC%/examples/calcxx/calcxx.cc\r
-sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.cc > calcxx-driver.cc\r
+sed "/#[        ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.cc > calcxx-driver.cc\r
 if errorlevel 1 goto calcxxFileError\r
 mv ./calcxx-driver.cc %XSRC%/examples/calcxx/calcxx-driver.cc\r
-sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.hh > calcxx-driver.hh\r
+sed "/#[        ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.hh > calcxx-driver.hh\r
 if errorlevel 1 goto calcxxFileError\r
 mv ./calcxx-driver.hh %XSRC%/examples/calcxx/calcxx-driver.hh\r
-sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.cc > calcxx-parser.cc\r
+sed "/#[        ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.cc > calcxx-parser.cc\r
 if errorlevel 1 goto calcxxFileError\r
 mv ./calcxx-parser.cc %XSRC%/examples/calcxx/calcxx-parser.cc\r
-sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.hh > calcxx-parser.hh\r
+sed "/#[        ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.hh > calcxx-parser.hh\r
 if errorlevel 1 goto calcxxFileError\r
 mv ./calcxx-parser.hh %XSRC%/examples/calcxx/calcxx-parser.hh\r
-:sed "/#[      ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.yy > calcxx-parser.yy\r
+:sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.yy > calcxx-parser.yy\r
 :if errorlevel 1 goto calcxxFileError\r
 :mv ./calcxx-parser.yy %XSRC%/examples/calcxx/calcxx-parser.yy\r
-sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.cc > calcxx-scanner.cc\r
+sed "/#[        ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.cc > calcxx-scanner.cc\r
 if errorlevel 1 goto calcxxFileError\r
 mv ./calcxx-scanner.cc %XSRC%/examples/calcxx/calcxx-scanner.cc\r
-:sed "/#[      ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.ll > calcxx-scanner.ll\r
+:sed "/#[       ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.ll > calcxx-scanner.ll\r
 :if errorlevel 1 goto calcxxFileError\r
 :mv ./calcxx-scanner.ll %XSRC%/examples/calcxx/calcxx-scanner.ll\r
 sed "s/calc++/calcxx/" %XSRC%/examples/calcxx/test > test\r
@@ -384,6 +434,10 @@ goto End
 echo ./data/lalr1.cc file editing failed!\r
 goto End\r
 \r
+:glr_ccFileError\r
+echo ./data/glr.cc file editing failed!\r
+goto End\r
+\r
 :location_ccFileError\r
 echo ./data/location.cc file editing failed!\r
 goto End\r
@@ -420,10 +474,7 @@ if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
 :NoRen1\r
 if "%SHELL%" == "/bin/sh" set SHELL=\r
 if "%HOME%" == "%XSRC%/djgpp" set HOME=\r
-set ARGS=\r
 set CONFIG_SITE=\r
 set HOSTNAME=\r
 set NLS=\r
-set CACHING=\r
-set DEPENDENCY_TRACKING=\r
 set XSRC=\r