Merge remote-tracking branch 'origin/maint'

[bison.git] / djgpp / config.bat

diff --git a/djgpp/config.bat b/djgpp/config.bat
index 05c2ba2c218d85f6c366d52af2ef08a52bd3364c..e30c939fddfc33112304f594a4be2d9da7d0d84b 100644 (file)
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -4,21 +4,20 @@ Rem Configure Bison for DJGPP.
 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 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
+Rem Copyright (C) 2005-2012 Free Software Foundation, Inc.\r

 \r
 \r

-Rem This program is free software; you can redistribute it and/or modify\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 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 the Free Software Foundation, either version 3 of the License, or\r
+Rem (at your option) any later version.\r
+Rem\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
 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\r

 Rem You should have received a copy of the GNU General Public License\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
+Rem along with this program.  If not, see <http://www.gnu.org/licenses/>.\r

 \r
 echo Configuring Bison for DJGPP v2.x...\r
 \r
 \r
 echo Configuring Bison for DJGPP v2.x...\r
 \r


@@ -143,17 +142,17 @@ shift
 if not "%1" == "" goto ArgLoop\r
 \r
 Rem Create an arguments file for the configure script.\r
 if not "%1" == "" goto ArgLoop\r
 \r
 Rem Create an arguments file for the configure script.\r

-echo --srcdir=%XSRC% > arguments\r
-if "%CACHING%" == "enabled"              echo --cache-file=%XSRC%/djgpp/config.cache >> arguments\r
-if "%DEPENDENCY_TRACKING%" == "enabled"  echo --enable-dependency-tracking >> arguments\r
-if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> arguments\r
-if "%LIBICONV_PREFIX%" == "enabled"      echo --with-libiconv-prefix >> arguments\r
-if "%LIBICONV_PREFIX%" == "disabled"     echo --without-libiconv-prefix >> arguments\r
-if "%LIBINTL_PREFIX%" == "enabled"       echo --with-libintl-prefix >> arguments\r
-if "%LIBINTL_PREFIX%" == "disabled"      echo --without-libintl-prefix >> arguments\r
-if "%HTML%" == "enabled"                 echo --enable-html >> arguments\r
-if "%HTML%" == "disabled"                echo --disable-html >> arguments\r
-if not "%ARGS%" == ""                    echo %ARGS% >> arguments\r
+echo --srcdir=%XSRC% > args\r
+if "%CACHING%" == "enabled"              echo --cache-file=%XSRC%/djgpp/config.cache >> args\r
+if "%DEPENDENCY_TRACKING%" == "enabled"  echo --enable-dependency-tracking >> args\r
+if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> args\r
+if "%LIBICONV_PREFIX%" == "enabled"      echo --with-libiconv-prefix >> args\r
+if "%LIBICONV_PREFIX%" == "disabled"     echo --without-libiconv-prefix >> args\r
+if "%LIBINTL_PREFIX%" == "enabled"       echo --with-libintl-prefix >> args\r
+if "%LIBINTL_PREFIX%" == "disabled"      echo --without-libintl-prefix >> args\r
+if "%HTML%" == "enabled"                 echo --enable-html >> args\r
+if "%HTML%" == "disabled"                echo --disable-html >> args\r
+if not "%ARGS%" == ""                    echo %ARGS% >> args\r

 set ARGS=\r
 set CACHING=\r
 set DEPENDENCY_TRACKING=\r
 set ARGS=\r
 set CACHING=\r
 set DEPENDENCY_TRACKING=\r


@@ -164,22 +163,26 @@ set HTML=
 if "%XSRC%" == "." goto InPlace\r
 \r
 :NotInPlace\r
 if "%XSRC%" == "." goto InPlace\r
 \r
 :NotInPlace\r

-redir -e /dev/null update %XSRC%/configure.orig ./configure\r
+redir -e /dev/null update %XSRC%/configure.org ./configure\r

 test -f ./configure\r
 if errorlevel 1 update %XSRC%/configure ./configure\r
 \r
 :InPlace\r
 Rem Update configuration files\r
 echo Updating configuration scripts...\r
 test -f ./configure\r
 if errorlevel 1 update %XSRC%/configure ./configure\r
 \r
 :InPlace\r
 Rem Update configuration files\r
 echo Updating configuration scripts...\r

-test -f ./configure.orig\r
-if errorlevel 1 update configure configure.orig\r
-sed -f %XSRC%/djgpp/config.sed configure.orig > configure\r
+test -f ./configure.org\r
+if errorlevel 1 update configure configure.org\r
+sed -f %XSRC%/djgpp/config.sed configure.org > configure\r

 if errorlevel 1 goto SedError\r
 \r
 Rem Make sure they have a config.site file\r
 set CONFIG_SITE=%XSRC%/djgpp/config.site\r
 if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto SmallEnv\r
 \r
 if errorlevel 1 goto SedError\r
 \r
 Rem Make sure they have a config.site file\r
 set CONFIG_SITE=%XSRC%/djgpp/config.site\r
 if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto SmallEnv\r
 \r

+Rem inttypes_.h and inttypes.h map to the same 8.3 alias.\r
+test -f %XSRC%/lib/inttypes_.h\r
+if not errorlevel 1 mv -f %XSRC%/lib/inttypes_.h %XSRC%/lib/_inttypes.h\r
+\r

 Rem Make sure crucial file names are not munged by unpacking\r
 test -f %XSRC%/po/Makefile.in.in\r
 if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in\r
 Rem Make sure crucial file names are not munged by unpacking\r
 test -f %XSRC%/po/Makefile.in.in\r
 if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in\r


@@ -205,6 +208,51 @@ test -f %XSRC%/data/c++.m4
 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
 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

+test -f %XSRC%/data/c++-skel.m4\r
+if not errorlevel 1 mv -f %XSRC%/data/c++-skel.m4 %XSRC%/data/cxx-skel.m4\r
+test -f %XSRC%/data/cxx-skel.m4\r
+if errorlevel 1 mv -f %XSRC%/data/cpp-skel.m4 %XSRC%/data/cxx-skel.m4\r
+test -f %XSRC%/build-aux/javacomp.sh.in\r
+if not errorlevel 1 mv -f %XSRC%/build-aux/javacomp.sh.in %XSRC%/build-aux/javacomp.sh-in\r
+test -f %XSRC%/build-aux/javacomp.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javacomp.sh %XSRC%/build-aux/javacomp.sh-in\r
+test -f %XSRC%/build-aux/javacomp.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javacomp.shin %XSRC%/build-aux/javacomp.sh-in\r
+test -f %XSRC%/build-aux/javacomp.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javacomp.sh_in %XSRC%/build-aux/javacomp.sh-in\r
+test -f %XSRC%/build-aux/javacomp.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javacomp.sh.in %XSRC%/build-aux/javacomp.sh-in\r
+test -f %XSRC%/build-aux/javaexec.sh.in\r
+if not errorlevel 1 mv -f %XSRC%/build-aux/javaexec.sh.in %XSRC%/build-aux/javaexec.sh-in\r
+test -f %XSRC%/build-aux/javaexec.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javaexec.sh %XSRC%/build-aux/javaexec.sh-in\r
+test -f %XSRC%/build-aux/javaexec.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javaexec.shin %XSRC%/build-aux/javaexec.sh-in\r
+test -f %XSRC%/build-aux/javaexec.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javaexec.sh_in %XSRC%/build-aux/javaexec.sh-in\r
+test -f %XSRC%/build-aux/javaexec.sh-in\r
+if errorlevel 1 mv -f %XSRC%/build-aux/javaexec_sh.in %XSRC%/build-aux/javaexec.sh-in\r
+test -f %XSRC%/doc/yacc.1.in\r
+if not errorlevel 1 mv -f %XSRC%/doc/yacc.1.in %XSRC%/doc/yacc.1-in\r
+test -f %XSRC%/doc/yacc.1-in\r
+if errorlevel 1 mv -f %XSRC%/doc/yacc.1 %XSRC%/doc/yacc.1-in\r
+test -f %XSRC%/doc/yacc.1-in\r
+if errorlevel 1 mv -f %XSRC%/doc/yacc.1in %XSRC%/doc/yacc.1-in\r
+test -f %XSRC%/doc/yacc.1-in\r
+if errorlevel 1 mv -f %XSRC%/doc/yacc.1_in %XSRC%/doc/yacc.1-in\r
+test -f %XSRC%/doc/yacc.1-in\r
+if errorlevel 1 mv -f %XSRC%/doc/yacc_1.in %XSRC%/doc/yacc.1-in\r
+test -f %XSRC%/etc/bench.pl.in\r
+if not errorlevel 1 mv -f %XSRC%/etc/bench.pl.in %XSRC%/etc/bench.pl-in\r
+test -f %XSRC%/etc/bench.pl-in\r
+if errorlevel 1 mv -f %XSRC%/etc/bench.pl %XSRC%/etc/bench.pl-in\r
+test -f %XSRC%/etc/bench.pl-in\r
+if errorlevel 1 mv -f %XSRC%/etc/bench.plin %XSRC%/etc/bench.pl-in\r
+test -f %XSRC%/etc/bench.pl-in\r
+if errorlevel 1 mv -f %XSRC%/etc/bench.pl_in %XSRC%/etc/bench.pl-in\r
+test -f %XSRC%/etc/bench.pl-in\r
+if errorlevel 1 mv -f %XSRC%/etc/bench_pl.in %XSRC%/etc/bench.pl-in\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
 :scan_gram_c_Test\r
 test -f %XSRC%/src/c-scan-gram.c\r
 if not errorlevel 1 goto scan_skel_c_Test\r


@@ -222,17 +270,22 @@ sed "s/c++\.m4/cxx.m4/" %XSRC%/data/lalr1.cc > lalr1.cc
 if errorlevel 1 goto lalr1_ccFileError\r
 mv ./lalr1.cc %XSRC%/data/lalr1.cc\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/location.cc > location.cc\r
 if errorlevel 1 goto lalr1_ccFileError\r
 mv ./lalr1.cc %XSRC%/data/lalr1.cc\r
 sed "s/c++\.m4/cxx.m4/" %XSRC%/data/location.cc > location.cc\r

-if errorlevel 1 goto location.ccFileError\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
 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
+if errorlevel 1 goto glr_ccFileError\r

 mv ./glr.cc %XSRC%/data/glr.cc\r
 \r
 mv ./glr.cc %XSRC%/data/glr.cc\r
 \r

+Rem Fix src/getargs.c to reflect the renaming of c++-skel.m4\r
+sed "s/c++-skel\.m4/cxx-skel.m4/" %XSRC%/src/getargs.c > getargs.c\r
+if errorlevel 1 goto getargs_cFileError\r
+mv ./getargs.c %XSRC%/src/getargs.c\r
+\r

 Rem Define DJGPP specific defs in config.hin\r
 echo Editing config.hin...\r
 Rem Define DJGPP specific defs in config.hin\r
 echo Editing 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
+test -f %XSRC%/lib/config_h.org\r
+if errorlevel 1 update %XSRC%/lib/config.hin %XSRC%/lib/config_h.org\r
+sed -f %XSRC%/djgpp/config_h.sed %XSRC%/lib/config_h.org > config.hin\r

 if errorlevel 1 goto SedError2\r
 mv -f config.hin %XSRC%/lib/config.hin\r
 \r
 if errorlevel 1 goto SedError2\r
 mv -f config.hin %XSRC%/lib/config.hin\r
 \r


@@ -241,6 +294,12 @@ Rem Fixing ilicit testsuite file name.
 test -f %XSRC%/tests/c++.at\r
 if not errorlevel 1 mv -f %XSRC%/tests/c++.at %XSRC%/tests/cxx.at\r
 \r
 test -f %XSRC%/tests/c++.at\r
 if not errorlevel 1 mv -f %XSRC%/tests/c++.at %XSRC%/tests/cxx.at\r
 \r

+test -f %XSRC%/tests/testsuite.org\r
+if errorlevel 1 update %XSRC%/tests/testsuite %XSRC%/tests/testsuite.org\r
+sed -f %XSRC%/djgpp/testsuite.sed %XSRC%/tests/testsuite.org > testsuite.tmp\r
+if errorlevel 1 goto SedError3\r
+mv -f ./testsuite.tmp %XSRC%/tests/testsuite\r
+\r

 Rem Fixing ilicit calc++ file names in the calc++ directory.\r
 test -d %XSRC%/examples/calc++\r
 if not errorlevel 1 mv -f %XSRC%/examples/calc++ %XSRC%/examples/calcxx\r
 Rem Fixing ilicit calc++ file names in the calc++ directory.\r
 test -d %XSRC%/examples/calc++\r
 if not errorlevel 1 mv -f %XSRC%/examples/calc++ %XSRC%/examples/calcxx\r


@@ -413,20 +472,20 @@ redir -e /dev/null rm %XSRC%/po/stamp-cat-id
 Rem Update the arguments file for the configure script.\r
 Rem We prefer without-included-gettext because libintl.a from gettext package\r
 Rem is the only one that is garanteed to have been ported to DJGPP.\r
 Rem Update the arguments file for the configure script.\r
 Rem We prefer without-included-gettext because libintl.a from gettext package\r
 Rem is the only one that is garanteed to have been ported to DJGPP.\r

-echo --enable-nls --without-included-gettext >> arguments\r
+echo --enable-nls --without-included-gettext >> args\r

 goto ConfigurePackage\r
 \r
 :MissingNLSTools\r
 echo Needed libs/tools for NLS not found. Configuring without NLS.\r
 :WithoutNLS\r
 Rem Update the arguments file for the configure script.\r
 goto ConfigurePackage\r
 \r
 :MissingNLSTools\r
 echo Needed libs/tools for NLS not found. Configuring without NLS.\r
 :WithoutNLS\r
 Rem Update the arguments file for the configure script.\r

-echo --disable-nls >> arguments\r
+echo --disable-nls >> args\r

 \r
 :ConfigurePackage\r
 echo Running the ./configure script...\r
 \r
 :ConfigurePackage\r
 echo Running the ./configure script...\r

-sh ./configure @arguments\r
+sh ./configure @args\r

 if errorlevel 1 goto CfgError\r
 if errorlevel 1 goto CfgError\r

-rm arguments\r
+rm args\r

 echo Done.\r
 goto End\r
 \r
 echo Done.\r
 goto End\r
 \r


@@ -438,6 +497,10 @@ goto End
 echo ./data/glr.cc file editing failed!\r
 goto End\r
 \r
 echo ./data/glr.cc file editing failed!\r
 goto End\r
 \r

+:getargs_cFileError\r
+echo ./src/getargs.c file editing failed!\r
+goto End\r
+\r

 :location_ccFileError\r
 echo ./data/location.cc file editing failed!\r
 goto End\r
 :location_ccFileError\r
 echo ./data/location.cc file editing failed!\r
 goto End\r


@@ -455,7 +518,11 @@ echo ./configure script editing failed!
 goto End\r
 \r
 :SedError2\r
 goto End\r
 \r
 :SedError2\r

-echo ./config.hin editing failed!\r
+echo ./lib/config.hin editing failed!\r
+goto End\r
+\r
+:SedError3\r
+echo ./tests/testsuite editing failed!\r

 goto End\r
 \r
 :CfgError\r
 goto End\r
 \r
 :CfgError\r