[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
DJGPP specific patch for bison
|
From: |
Juan Manuel Guerrero |
|
Subject: |
DJGPP specific patch for bison |
|
Date: |
Fri, 31 Aug 2001 14:15:05 +0200 |
I would like to present a patch for DJGPP support for bison.
The patch is based on bison-1_29-branch (timestamp: 2001-08-28).
The MSDOS/DJGPP specific issue is the handling of the output file
name extensions. DJGPP detects at runtime if a LFN-API is available
or not. A DJGPP port of bison shall use the standard POSIX extensions
if it is running in a DOS session on Win9X or successors where LFN
support is available. If no LFN support is available, like under plain
DOS, then the MSDOS specific extensions, like _tab.c, etc will be used.
To achieve this goal minor modifications to system.h and files.c are needed.
The DJGPP port uses pathconf() to detect at runtime the used file system.
In system.h the following lines:
#ifdef VMS
/* VMS. */
# define EXT_TAB "_tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H "_stype"
# define EXT_GUARD_C "_guard"
#else /* ! VMS */
# ifdef MSDOS
/* MS DOS. */
# define EXT_TAB "_tab"
# define EXT_OUTPUT ".out"
# define EXT_STYPE_H ".sth"
# define EXT_GUARD_C ".guc"
# else /* ! MSDOS */
/* Standard. */
# define EXT_TAB ".tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H ".stype"
# define EXT_GUARD_C ".guard"
# endif /* ! MSDOS */
#endif /* ! VMS */
have been replaced by this ones:
#ifdef VMS
/* VMS. */
# define EXT_TAB "_tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H "_stype"
# define EXT_GUARD_C "_guard"
# define EXT_TYPE(ext) (ext)
#else /* ! VMS */
# ifdef MSDOS
# ifdef __DJGPP__
/* DJGPP */
# define EXT_TAB ((pathconf (NULL, _PC_NAME_MAX) > 12) ? ".tab"
: "_tab")
# define EXT_OUTPUT ((pathconf (NULL, _PC_NAME_MAX) > 12) ?
".output" : ".out")
# define EXT_STYPE_H ((pathconf (NULL, _PC_NAME_MAX) > 12) ?
".stype" : ".sth")
# define EXT_GUARD_C ((pathconf (NULL, _PC_NAME_MAX) > 12) ?
".guard" : ".guc")
# define EXT_TYPE(ext) ((pathconf (NULL, _PC_NAME_MAX) > 12) ? (ext) :
"")
# else /* ! DJGPP */
/* MS DOS. */
# define EXT_TAB "_tab"
# define EXT_OUTPUT ".out"
# define EXT_STYPE_H ".sth"
# define EXT_GUARD_C ".guc"
# define EXT_TYPE(ext) ""
# endif
# else /* ! MSDOS */
/* Standard. */
# define EXT_TAB ".tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H ".stype"
# define EXT_GUARD_C ".guard"
# define EXT_TYPE(ext) (ext)
# endif /* ! MSDOS */
#endif /* ! VMS */
At the same time, in files.c lines like these ones:
#ifndef MSDOS
stringappend (attrsfile, header_extension);
#endif /* MSDOS */
have been replaced by this ones:
stringappend (attrsfile, EXT_TYPE (header_extension));
Please inspect the patch and the changelog.
Also, on system.h the following macro has been added:
#if defined (MSDOS) && !defined (__DJGPP__)
# define NO_CASE_PRESERVE
#endif
and in files.c, lines like these ones:
#ifdef MSDOS
strlwr (spec_outfile);
#endif /* MSDOS */
have been replaced by these ones:
#ifdef NO_CASE_PRESERVE
strlwr (spec_outfile);
#endif /* NO_CASE_PRESERVE */
These are all the changes needed for the sources.
A couple of new files are needed to handle the configuration of
the package using DJGPP tools. All this files have been located
in the new djgpp subdir. This files are: config.bat, config.sed,
config.site, readme.in and makefile.am. The only rule contained
in makefile.am is the rule to generate readme from readme.in
replacing expressions like: @VERSION@ by the appropiate value
extracted from AM_INIT_AUTOMAKE. This is the way this is handled
by other GNU packages like grep, texinfo, textutils, gettext,etc
that offer build-in DJGPP support. The patch will also add to
AC_OUTPUT the line: djgpp/Makefile. I have also added a minor
sub chapter to bison.texinfo explaning the different extensions
to be used depending on the DOS/WINDOWS file system to be used.
The patch will remove configure.bat from the top srcdir. This file
gives some limited support for GO32 (aka DJGPP 1.0). Developement
of GO32 has been stopped 6 or 7 years ago. To avoid confusion
with the new configuration batch file located in djgpp subdir
I would seriously suggest to remove it.
Comments, suggestions, objections, improvement,etc. are welcome.
The patch has been splited in two parts and can be applied in
any sequence. For your convenience, I have used unix-style EOL
instead of DOS-style EOL in this patch. Netherless it should
be noticed that the DOS batch file: config.bat *must* be
distributed using DOS-style EOL or it will be completely useless
for DOS/windows users. This is because command.com (the DOS shell)
refuses to run batch files that contain other EOL chars than
DOS-style EOL chars.
Regards,
Guerrero, Juan M.
DJGPP support for bison, patch 1/2
2001-08-28 Guerrero, Juan Manuel <address@hidden>
* configure.bat: Obsolete. Removed
* configure.in (AC_OUTPUT): djgpp/Makefile added.
* djgpp/config.bat: New file. DJGPP specific.
* djgpp/config.sed: New file. DJGPP specific.
* djgpp/config.site: New file. DJGPP specific.
* djgpp/Makefile.am: New file. DJGPP specific.
* djgpp/README.in: New file. DJGPP specific.
* doc/bison.texinfo: Sub chapter about extension limitations
under plain DOS added.
* Makefile.am (SUBDIRS): Entry for djgpp subdir added.
(EXTRA_DIST): configure.bat removed.
* src/files.c (compute_base_names): Macro MSDOS replaced
by macro NO_CASE_PRESERVE.
(output_files): MSDOS conditional removed. New macro EXT_TYPE
will provide at runtime the appropiate output file extension.
* src/system.h [MSDOS] [__DJGPP__]: Use pathconf to choose POSIX or
DOS file extensions at run time.
[MSDOS] [__DJGPP__]: New macro NO_CASE_PRESERVE. DJGPP is case
preserving under Win9X.
[MSDOS] [__GO32__]: Macro __DJGPP__ added. __GO32__ is obsolete
and its use is deprecated.
[MSDOS] [__DJGPP__]: New macro EXT_TYPE. Determinates at runtime
the src file and header file extension string to be used. If LFN-API
is available, the src and header file extension will be added to the
output file name. If no LFN-API is available no extension at all
will be added to the output file name.
[MSDOS] [!__DJGPP__]: New macro EXT_TYPE. The src file and header
file extension strings default to empty. No extension will be
added to the output file name at all.
[!MSDOS]: New macro EXT_TYPE. The src file and header file
extensions will always be added to the output file name.
* tests/Makefile.am (testsuite): Better support of OSs with
filename length restrictions. address@hidden replaced by
address@hidden
diff -acprNC5 bison-1_29-branch.orig/configure.bat
bison-1_29-branch.djgpp/configure.bat
*** bison-1_29-branch.orig/configure.bat Sat Sep 26 00:06:24 1992
--- bison-1_29-branch.djgpp/configure.bat Thu Jan 1 00:00:00 1970
***************
*** 1,28 ****
- @echo off
- echo Configuring bison for go32
- rem This batch file assumes a unix-type "sed" program
-
- echo # Makefile generated by "configure.bat"> Makefile
- echo all.dos : bison >> Makefile
-
- if exist config.sed del config.sed
-
- echo "s/@srcdir@/./g ">> config.sed
- echo "s/@CC@/gcc/g ">> config.sed
- echo "s/@INSTALL@//g ">> config.sed
- echo "s/@INSTALL_PROGRAM@//g ">> config.sed
- echo "s/@INSTALL_DATA@//g ">> config.sed
- echo "s/@DEFS@/-DHAVE_STRERROR/g ">> config.sed
- echo "s/@LIBS@//g ">> config.sed
- echo "s/@ALLOCA@//g ">> config.sed
-
- echo "/^bison[ ]*:/,/-o/ { ">> config.sed
- echo " s/ \$(CC)/ >bison.rf/ ">> config.sed
- echo " /-o/ a\ ">> config.sed
- echo " $(CC) @bison.rf ">> config.sed
- echo "} ">> config.sed
-
- sed -e "s/^\"//" -e "s/\"$//" -e "s/[ ]*$//" config.sed > config2.sed
- sed -f config2.sed Makefile.in >> Makefile
- del config.sed
- del config2.sed
--- 0 ----
diff -acprNC5 bison-1_29-branch.orig/configure.in
bison-1_29-branch.djgpp/configure.in
*** bison-1_29-branch.orig/configure.in Mon Aug 6 10:35:22 2001
--- bison-1_29-branch.djgpp/configure.in Tue Aug 28 22:39:02 2001
*************** AC_SUBST(LIBOBJS)
*** 81,86 ****
AC_OUTPUT([Makefile
config/Makefile
intl/Makefile po/Makefile.in
lib/Makefile src/Makefile doc/Makefile
m4/Makefile
! tests/Makefile tests/atconfig])
--- 81,87 ----
AC_OUTPUT([Makefile
config/Makefile
intl/Makefile po/Makefile.in
lib/Makefile src/Makefile doc/Makefile
m4/Makefile
! tests/Makefile tests/atconfig
! djgpp/Makefile])
diff -acprNC5 bison-1_29-branch.orig/djgpp/config.bat
bison-1_29-branch.djgpp/djgpp/config.bat
*** bison-1_29-branch.orig/djgpp/config.bat Thu Jan 1 00:00:00 1970
--- bison-1_29-branch.djgpp/djgpp/config.bat Tue Aug 28 22:42:22 2001
***************
*** 0 ****
--- 1,211 ----
+ @echo off
+ echo Configuring GNU Bison for DJGPP v2.x...
+
+ Rem The SmallEnv tests protect against fixed and too small size
+ Rem of the environment in stock DOS shell.
+
+ Rem Find out if NLS is wanted or not,
+ Rem if dependency-tracking is wanted or not
+ Rem and where the sources are.
+ Rem We always default to NLS support,
+ Rem no dependency tracking
+ Rem and to in place configuration.
+ set ARGS=
+ set NLS=enabled
+ if not "%NLS%" == "enabled" goto SmallEnv
+ set DEPENDENCY_TRACKING=disabled
+ if not "%DEPENDENCY_TRACKING%" == "disabled" goto SmallEnv
+ set XSRC=.
+ if not "%XSRC%" == "." goto SmallEnv
+
+ Rem Loop over all arguments.
+ Rem Special arguments are: NLS, XSRC and DEPS.
+ Rem All other arguments are stored into ARGS.
+ :ArgLoop
+ set SPECIAL_ARG_SEEN=0
+ if not "%SPECIAL_ARG_SEEN%" == "0" goto SmallEnv
+ if not "%1" == "NLS" if not "%1" == "nls" if not "%1" == "NO-NLS" if not "%1"
== "no-NLS" if not "%1" == "no-nls" goto DependencyOpt
+ if "%1" == "no-nls" set NLS=disabled
+ if "%1" == "no-NLS" set NLS=disabled
+ if "%1" == "NO-NLS" set NLS=disabled
+ if not "%NLS%" == "disabled" goto SmallEnv
+ set SPECIAL_ARG_SEEN=1
+ if not "%SPECIAL_ARG_SEEN%" == "1" goto SmallEnv
+ shift
+ :DependencyOpt
+ set SPECIAL_ARG_SEEN=0
+ if not "%1" == "dep" if not "%1" == "DEP" if not "%1" == "no-dep" if not "%1"
== "NO-DEP" goto SrcDirOpt
+ if "%1" == "dep" set DEPENDENCY_TRACKING=enabled
+ if "%1" == "DEP" set DEPENDENCY_TRACKING=enabled
+ if not "%DEPENDENCY_TRACKING%" == "enabled" goto SmallEnv
+ set SPECIAL_ARG_SEEN=1
+ if not "%SPECIAL_ARG_SEEN%" == "1" goto SmallEnv
+ shift
+ :SrcDirOpt
+ set SPECIAL_ARG_SEEN=0
+ if not "%SPECIAL_ARG_SEEN%" == "0" goto SmallEnv
+ echo %1 | grep -q "/"
+ if errorlevel 1 goto NextArg
+ set XSRC=%1
+ if not "%XSRC%" == "%1" goto SmallEnv
+ set SPECIAL_ARG_SEEN=1
+ if not "%SPECIAL_ARG_SEEN%" == "1" goto SmallEnv
+ :NextArg
+ if "%SPECIAL_ARG_SEEN%" == "0" set _ARGS=%ARGS% %1
+ if "%SPECIAL_ARG_SEEN%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto SmallEnv
+ set ARGS=%_ARGS%
+ set _ARGS=
+ shift
+ if not "%1" == "" goto ArgLoop
+ set SPECIAL_ARG_SEEN=
+
+ if "%XSRC%" == "." goto InPlace
+
+ :NotInPlace
+ redir -e /dev/null update %XSRC%/configure.orig ./configure
+ test -f ./configure
+ if errorlevel 1 update %XSRC%/configure ./configure
+
+ :InPlace
+ Rem Update configuration files
+ echo Updating configuration scripts...
+ test -f ./configure.orig
+ if errorlevel 1 update configure configure.orig
+ sed -f %XSRC%/djgpp/config.sed configure.orig > configure
+ if errorlevel 1 goto SedError
+
+ Rem Make sure they have a config.site file
+ set CONFIG_SITE=%XSRC%/djgpp/config.site
+ if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto SmallEnv
+
+ Rem Make sure crucial file names are not munged by unpacking
+ test -f %XSRC%/po/Makefile.in.in
+ if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
+ test -f %XSRC%/po/Makefile.am.in
+ if not errorlevel 1 mv -f %XSRC%/po/Makefile.am.in %XSRC%/po/Makefile.am-in
+
+ Rem This is required because DOS/Windows are case-insensitive
+ Rem to file names, and "make install" will do nothing if Make
+ Rem finds a file called `install'.
+ if exist INSTALL ren INSTALL INSTALL.txt
+
+ Rem Set HOSTNAME so it shows in config.status
+ if not "%HOSTNAME%" == "" goto hostdone
+ if "%windir%" == "" goto msdos
+ set OS=MS-Windows
+ if not "%OS%" == "MS-Windows" goto SmallEnv
+ goto haveos
+ :msdos
+ set OS=MS-DOS
+ if not "%OS%" == "MS-DOS" goto SmallEnv
+ :haveos
+ if not "%USERNAME%" == "" goto haveuname
+ if not "%USER%" == "" goto haveuser
+ echo No USERNAME and no USER found in the environment, using default values
+ set HOSTNAME=Unknown PC
+ if not "%HOSTNAME%" == "Unknown PC" goto SmallEnv
+ goto userdone
+ :haveuser
+ set HOSTNAME=%USER%'s PC
+ if not "%HOSTNAME%" == "%USER%'s PC" goto SmallEnv
+ goto userdone
+ :haveuname
+ set HOSTNAME=%USERNAME%'s PC
+ if not "%HOSTNAME%" == "%USERNAME%'s PC" goto SmallEnv
+ :userdone
+ set _HOSTNAME=%HOSTNAME%, %OS%
+ if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto SmallEnv
+ set HOSTNAME=%_HOSTNAME%
+ :hostdone
+ set _HOSTNAME=
+ set OS=
+
+ Rem install-sh is required by the configure script but clashes with the
+ Rem various Makefile install-foo targets, so we MUST have it before the
+ Rem script runs and rename it afterwards
+ test -f %XSRC%/install-sh
+ if not errorlevel 1 goto NoRen0
+ test -f %XSRC%/install-sh.sh
+ if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh
+ :NoRen0
+
+ if "%NLS%" == "disabled" goto WithoutNLS
+
+ :WithNLS
+ Rem Check for the needed libraries and binaries.
+ test -x /dev/env/DJDIR/bin/msgfmt.exe
+ if not errorlevel 0 goto MissingNLSTools
+ test -x /dev/env/DJDIR/bin/xgettext.exe
+ if not errorlevel 0 goto MissingNLSTools
+ test -f /dev/env/DJDIR/include/libcharset.h
+ if not errorlevel 0 goto MissingNLSTools
+ test -f /dev/env/DJDIR/lib/libcharset.a
+ if not errorlevel 0 goto MissingNLSTools
+ test -f /dev/env/DJDIR/include/iconv.h
+ if not errorlevel 0 goto MissingNLSTools
+ test -f /dev/env/DJDIR/lib/libiconv.a
+ if not errorlevel 0 goto MissingNLSTools
+ test -f /dev/env/DJDIR/include/libintl.h
+ if not errorlevel 0 goto MissingNLSTools
+ test -f /dev/env/DJDIR/lib/libintl.a
+ if not errorlevel 0 goto MissingNLSTools
+
+ Rem Recreate the files in the %XSRC%/po subdir with our ported tools.
+ redir -e /dev/null rm %XSRC%/po/*.gmo
+ redir -e /dev/null rm %XSRC%/po/bison.pot
+ redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c
+ redir -e /dev/null rm %XSRC%/po/stamp-cat-id
+
+ Rem We prefer without-included-gettext because libintl.a from gettext package
+ Rem is the only one that is garanteed to have been ported to DJGPP.
+ echo Running the ./configure script...
+ if "%DEPENDENCY_TRACKING%" == "disabled" goto WithoutDependencyTracking
+ sh ./configure --src=%XSRC% --enable-nls --without-included-gettext
--enable-dependency-tracking %ARGS%
+ if errorlevel 1 goto CfgError
+ echo Done.
+ goto End
+ :WithoutDependencyTracking
+ sh ./configure --src=%XSRC% --enable-nls --without-included-gettext
--disable-dependency-tracking %ARGS%
+ if errorlevel 1 goto CfgError
+ echo Done.
+ goto End
+
+ :MissingNLSTools
+ echo Needed libs/tools for NLS not found. Configuring without NLS.
+ :WithoutNLS
+ echo Running the ./configure script...
+ if "%DEPENDENCY_TRACKING%" == "enabled" goto WithDependencyTracking
+ sh ./configure --src=%XSRC% --disable-nls --disable-dependency-tracking %ARGS%
+ if errorlevel 1 goto CfgError
+ echo Done.
+ goto End
+ :WithDependencyTracking
+ sh ./configure --src=%XSRC% --disable-nls --enable-dependency-tracking %ARGS%
+ if errorlevel 1 goto CfgError
+ echo Done.
+ goto End
+
+ :SedError
+ echo ./configure script editing failed!
+ goto End
+
+ :CfgError
+ echo ./configure script exited abnormally!
+ goto End
+
+ :SmallEnv
+ echo Your environment size is too small. Enlarge it and run me again.
+ echo Configuration NOT done!
+
+ :End
+ test -f %XSRC%/install-sh.sh
+ if not errorlevel 1 goto NoRen1
+ test -f %XSRC%/install-sh
+ if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
+ :NoRen1
+ set ARGS=
+ set CONFIG_SITE=
+ set HOSTNAME=
+ set NLS=
+ set DEPENDENCY_TRACKING=
+ set XSRC=
diff -acprNC5 bison-1_29-branch.orig/djgpp/config.sed
bison-1_29-branch.djgpp/djgpp/config.sed
*** bison-1_29-branch.orig/djgpp/config.sed Thu Jan 1 00:00:00 1970
--- bison-1_29-branch.djgpp/djgpp/config.sed Tue Aug 28 22:39:02 2001
***************
*** 0 ****
--- 1,62 ----
+ # Additional editing of Makefiles
+ /(echo[ ]*':t/ a\
+ # DJGPP specific Makefile changes.\
+ /^aliaspath * *=/s,:,";",g;t t\
+ /TEXINPUTS=/s,:,";",g;t t\
+ /PATH=/s,:,";",g;t t\
+ s,\\.deps,_deps,g;t t\
+ s,\\.new\\.,_new.,g;t t\
+ s,\\.old\\.,_old.,g;t t\
+ s,\\.tab\\.,_tab.,g;t t\
+ s,Makefile\\.in\\.in,Makefile.in-in,g;t t\
+ s,Makefile\\.am\\.in,Makefile.am-in,g;t t\
+ /^install-info-am:/,/^$/ {\
+ /@list=/ s,\\\$(INFO_DEPS),& bison.i,\
+ /@for *file/ s,\\\$(INFO_DEPS),& bison.i,\
+ s,file-\\[0-9\\]\\[0-9\\],& \\$\\$file[0-9] \\$\\$file[0-9][0-9],\
+ }
+
+ # Makefile.in.in is renamed to Makefile.in-in.
+ /^ac_config_files=/,/_ACEOF/ {
+ s|po/Makefile\.in|&:po/Makefile.in-in|
+ }
+ /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
+
+ # We always use _deps instead of .deps.
+ # This make the generated Makefiles good
+ # for every DJGPP installation, not only
+ # the one where the package was configured.
+ s,\.deps,_deps,g
+
+ # Replace (command) > /dev/null with `command > /dev/null`, since
+ # parenthesized commands always return zero status in the ported Bash,
+ # even if the named command doesn't exist
+ /if ([^|;]*null/{
+ s,(,`,
+ s,),,
+ s,; *then,`; then,
+ }
+
+ # DOS-style absolute file names should be supported as well
+ /\*) top_srcdir=/s,/\*,[\\\\/]* | ?:[\\\\/]*,
+
+ # Prevent the spliting of conftest.subs.
+ # The sed script: conftest.subs is split into 48 or 90 lines long files.
+ # This will produce sed scripts called conftest.s1, conftest.s2, etc.
+ # that will not work if conftest.subs contains a multi line sed command
+ # at line #90. In this case the first part of the sed command will be the
+ # last line of conftest.s1 and the rest of the command will be the first lines
+ # of conftest.s2. So both script will not work properly.
+ # This matches the configure script produced by Autoconf 2.52
+ /ac_max_sed_lines=[0-9]/ s,=.*$,=`sed -n "$=" $tmp/subs.sed`,
+
+ # The following two items are changes needed for configuring
+ # and compiling across partitions.
+ # 1) The given srcdir value is always translated from the
+ # "x:" syntax into "/dev/x" syntax while we run configure.
+ /^[ ]*-srcdir=\*.*$/ a\
+ ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
+ /set X `ls -Lt \$srcdir/ i\
+ if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
+ srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\
+ fi
diff -acprNC5 bison-1_29-branch.orig/djgpp/config.site
bison-1_29-branch.djgpp/djgpp/config.site
*** bison-1_29-branch.orig/djgpp/config.site Thu Jan 1 00:00:00 1970
--- bison-1_29-branch.djgpp/djgpp/config.site Tue Aug 28 22:39:02 2001
***************
*** 0 ****
--- 1,44 ----
+ #! /bin/sh
+
+ # These two variables are required, otherwise looking for
+ # programs along the PATH will not work.
+ PATH_SEPARATOR=:
+ PATH_EXPAND=y
+
+ # This is required in for "test -f foo" to find foo.exe
+ export TEST_FINDS_EXE=y
+
+ # The root of the DJGPP tree serves as the default prefix
+ # for all paths that are hardcoded in the binaries.
+ # When installing the installation prefix must be supplied.
+ test "x$prefix" = xNONE && prefix='/dev/env/DJDIR'
+
+ # This is required for config.status script to be run, since
+ # ./configure runs it by invoking ${CONFIG_SHELL-/bin/sh}
+ # CONFIG_SHELL=${CONFIG_SHELL='sh'}
+
+ # These are set here so the generated Makefile's will be good
+ # for every DJGPP installation, not only the one where the
+ # package was configured.
+ # $INSTALL must be an absolute path name, otherwise config.status
+ # will try to prepend ./ and ../ to it when it goes into subdirs.
+ INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
+ RANLIB=${RANLIB='ranlib'}
+ GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+ MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+ XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
+
+ # A sane default for emacs.
+ ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
+
+ # A sane default for m4.
+ ac_cv_path_M4=${M4='/dev/env/DJDIR/bin/m4'}
+
+ # These are set here so the generated libtool will be good
+ # for every DJGPP installation, not only the one where the
+ # package was configured.
+ NM=${NM='nm'}
+ LD=${LD='ld'}
+
+ # Force the test for 'ln -s' to report 'cp -pf'.
+ ac_cv_prog_LN_S='cp -pf'
diff -acprNC5 bison-1_29-branch.orig/djgpp/Makefile.am
bison-1_29-branch.djgpp/djgpp/Makefile.am
*** bison-1_29-branch.orig/djgpp/Makefile.am Thu Jan 1 00:00:00 1970
--- bison-1_29-branch.djgpp/djgpp/Makefile.am Thu Aug 30 09:30:50 2001
***************
*** 0 ****
--- 1,19 ----
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+
+ EXTRA_DIST = README README.in config.bat config.sed config.site
+ MAINTAINERCLEANFILES = README
+
+ all-local: README
+
+ README: README.in $(top_srcdir)/configure.in
+ PACKAGE=`grep AM_INIT_AUTOMAKE $(top_srcdir)/configure.in | sed -e
's/AM_INIT_AUTOMAKE(\([^,)]*\),.*$$/\1/'`; \
+ VERSION=`grep AM_INIT_AUTOMAKE $(top_srcdir)/configure.in | sed -e
's/AM_INIT_AUTOMAKE([^,)]*, *\([^,)]*\).*$$/\1/'`; \
+ packageversion=`echo "$${VERSION}" | sed 's/\.//'`; \
+ treeversion=`echo "$${VERSION}"`; \
+ sed \
+ -e "s/@V@/$${PACKAGE}-$${VERSION}/g" \
+ -e "s/@VER@/$${VERSION}/g" \
+ -e "s/@packageversion@/$$packageversion/g" \
+ -e "s/@treeversion@/$$treeversion/g" \
+ $(srcdir)/README.in > t-$@
+ mv t-$@ $@
diff -acprNC5 bison-1_29-branch.orig/src/system.h
bison-1_29-branch.djgpp/src/system.h
*** bison-1_29-branch.orig/src/system.h Fri Aug 10 11:35:50 2001
--- bison-1_29-branch.djgpp/src/system.h Fri Aug 31 02:37:32 2001
*************** do {
\
*** 207,217 ****
#else
# define MAXSHORT 32767
# define MINSHORT -32768
#endif
! #if defined (MSDOS) && !defined (__GO32__)
# define BITS_PER_WORD 16
# define MAXTABLE 16383
#else
# define BITS_PER_WORD 32
# define MAXTABLE 32767
--- 207,217 ----
#else
# define MAXSHORT 32767
# define MINSHORT -32768
#endif
! #if defined (MSDOS) && !defined (__GO32__) && !defined (__DJGPP__)
# define BITS_PER_WORD 16
# define MAXTABLE 16383
#else
# define BITS_PER_WORD 32
# define MAXTABLE 32767
*************** do {
\
*** 229,251 ****
/* VMS. */
# define EXT_TAB "_tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H "_stype"
# define EXT_GUARD_C "_guard"
#else /* ! VMS */
# ifdef MSDOS
! /* MS DOS. */
! # define EXT_TAB "_tab"
! # define EXT_OUTPUT ".out"
! # define EXT_STYPE_H ".sth"
! # define EXT_GUARD_C ".guc"
# else /* ! MSDOS */
/* Standard. */
# define EXT_TAB ".tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H ".stype"
# define EXT_GUARD_C ".guard"
# endif /* ! MSDOS */
#endif /* ! VMS */
#if defined (VMS) & !defined (__VMS_POSIX)
# ifndef BISON_SIMPLE
--- 229,263 ----
/* VMS. */
# define EXT_TAB "_tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H "_stype"
# define EXT_GUARD_C "_guard"
+ # define EXT_TYPE(ext) (ext)
#else /* ! VMS */
# ifdef MSDOS
! # ifdef __DJGPP__
! /* DJGPP */
! # define EXT_TAB ((pathconf (NULL, _PC_NAME_MAX) > 12) ? ".tab"
: "_tab")
! # define EXT_OUTPUT ((pathconf (NULL, _PC_NAME_MAX) > 12) ?
".output" : ".out")
! # define EXT_STYPE_H ((pathconf (NULL, _PC_NAME_MAX) > 12) ?
".stype" : ".sth")
! # define EXT_GUARD_C ((pathconf (NULL, _PC_NAME_MAX) > 12) ?
".guard" : ".guc")
! # define EXT_TYPE(ext) ((pathconf (NULL, _PC_NAME_MAX) > 12) ? (ext) :
"")
! # else /* ! DJGPP */
! /* MS DOS. */
! # define EXT_TAB "_tab"
! # define EXT_OUTPUT ".out"
! # define EXT_STYPE_H ".sth"
! # define EXT_GUARD_C ".guc"
! # define EXT_TYPE(ext) ""
! # endif
# else /* ! MSDOS */
/* Standard. */
# define EXT_TAB ".tab"
# define EXT_OUTPUT ".output"
# define EXT_STYPE_H ".stype"
# define EXT_GUARD_C ".guard"
+ # define EXT_TYPE(ext) (ext)
# endif /* ! MSDOS */
#endif /* ! VMS */
#if defined (VMS) & !defined (__VMS_POSIX)
# ifndef BISON_SIMPLE
*************** do {
\
*** 262,266 ****
--- 274,282 ----
# endif
# ifndef BISON_HAIRY
# define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
# endif
#endif
+
+ #if defined (MSDOS) && !defined (__DJGPP__)
+ # define NO_CASE_PRESERVE
+ #endif
- DJGPP specific patch for bison,
Juan Manuel Guerrero <=