* testsuite.sed: Inhibit the use of disallowed characters.

[bison.git] / djgpp / config.bat

diff --git a/djgpp/config.bat b/djgpp/config.bat
index 1fb6e6153b018cd9a110c1a77b144967cc8af464..36ce75c6b88c2c03514d22359b702dc7b47e61c0 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
-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
@@ -164,22 +164,26 @@ set HTML=
 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.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
+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
@@ -230,11 +234,11 @@ mv ./glr.cc %XSRC%/data/glr.cc
 \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.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%/config.hin\r
+mv -f config.hin %XSRC%/lib/config.hin\r
 \r
 \r
 Rem Fixing ilicit testsuite file name.\r
@@ -413,20 +417,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
-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
-echo --disable-nls >> arguments\r
+echo --disable-nls >> args\r
 \r
 :ConfigurePackage\r
 echo Running the ./configure script...\r
-sh ./configure @arguments\r
+sh ./configure @args\r
 if errorlevel 1 goto CfgError\r
-rm arguments\r
+rm args\r
 echo Done.\r
 goto End\r
 \r