Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 23:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* m4/m4.m4: New, from CVS Autoconf.

Browse Source 
* configure.in: Invoke it.
* src/output.c (output_skeleton): Use its result instead of the
hard coded name.
This commit is contained in:
Akim Demaille
2002-02-25 14:00:57 +00:00
parent 381fb12e1e
commit abe017f60d
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-02-25 Akim Demaille <akim@epita.fr>
* m4/m4.m4: New, from CVS Autoconf.
* configure.in: Invoke it.
* src/output.c (output_skeleton): Use its result instead of the
hard coded name.
2002-02-25 Akim Demaille <akim@epita.fr> 2002-02-25 Akim Demaille <akim@epita.fr>
* lib/tempname.c, lib/mkstemp.c, m4/mkstemp.m4: New, stolen from * lib/tempname.c, lib/mkstemp.c, m4/mkstemp.m4: New, stolen from

5
configure.in
View File

@@ -42,6 +42,11 @@ AC_ISC_POSIX
AM_PROG_CC_STDC AM_PROG_CC_STDC
AC_PROG_RANLIB AC_PROG_RANLIB
AM_MISSING_PROG([AUTOM4TE], [autom4te]) AM_MISSING_PROG([AUTOM4TE], [autom4te])
BISON_PROG_GNU_M4
if test x"$ac_cv_prog_gnu_m4" != xyes; then
AC_MSG_ERROR([GNU M4 1.4 is required])
fi
AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
AC_ARG_ENABLE(gcc-warnings, AC_ARG_ENABLE(gcc-warnings,
[ --enable-gcc-warnings turn on lots of GCC warnings (not recommended)], [ --enable-gcc-warnings turn on lots of GCC warnings (not recommended)],

1
m4/Makefile.am
View File

@@ -9,6 +9,7 @@ glibc21.m4 \
iconv.m4 \ iconv.m4 \
isc-posix.m4 \ isc-posix.m4 \
lcmessage.m4 \ lcmessage.m4 \
m4.m4 \
malloc.m4 \ malloc.m4 \
mbrtowc.m4 \ mbrtowc.m4 \
mbstate_t.m4 \ mbstate_t.m4 \

12
src/output.c
View File

@@ -1001,15 +1001,17 @@ output_skeleton (void)
/* Invoke m4 on the definition of the muscles, and the skeleton. */ /* Invoke m4 on the definition of the muscles, and the skeleton. */
{ {
const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR"); const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
const char *m4 = getenv ("M4");
if (!m4)
m4 = M4;
if (!bison_pkgdatadir) if (!bison_pkgdatadir)
bison_pkgdatadir = PKGDATADIR; bison_pkgdatadir = PKGDATADIR;
if (trace_flag) if (trace_flag)
fprintf (stderr, fprintf (stderr,
"running: m4 -I %s m4sugar/m4sugar.m4 %s %s\n", "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
bison_pkgdatadir, tempfile, skeleton); m4, bison_pkgdatadir, tempfile, skeleton);
skel_in = readpipe ("m4", skel_in = readpipe (m4,
"-I", "-I", bison_pkgdatadir,
bison_pkgdatadir,
"m4sugar/m4sugar.m4", "m4sugar/m4sugar.m4",
tempfile, tempfile,
skeleton, skeleton,