* data/yacc.c (yyexhaustedlab): Define it when YYERROR_VERBOSE is

[bison.git] / djgpp / config.bat

diff --git a/djgpp/config.bat b/djgpp/config.bat
index 4eb44d58a0b7d20b8c60cf0e79f561eeb5d30221..aee4b55d9a7e7e1c8ddc2103d139ac7072f1bb0f 100644 (file)
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -143,17 +143,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


@@ -180,6 +180,10 @@ Rem Make sure they have a config.site file
 set CONFIG_SITE=%XSRC%/djgpp/config.site\r
 if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto SmallEnv\r
 \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 +209,11 @@ 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
+\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,12 +231,17 @@ 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
 test -f %XSRC%/lib/config_h.org\r
 Rem Define DJGPP specific defs in config.hin\r
 echo Editing config.hin...\r
 test -f %XSRC%/lib/config_h.org\r


@@ -241,6 +255,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 +433,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 +458,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 +479,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