Do not hard code values of directories in `configure.in'.

Update the `configure' tool chain.

* configure.in (XPFILE, XPFILE1, LOCALEDIR): Remove, handled by
src/makefile.am.
(VERSION_STRING): Use the third arg of AC_DEFINE_UNQUOTED.
(AC_OUTPUT): Add m4/Makefile.
Bump to bison 1.28a, 1.29 has never been released.
* acconfig.h (XPFILE, XPFILE1, LOCALEDIR): Remove, since they are
handled via src/Makefile.am.
(VERSION_STRING, PROTOTYPES, ENABLE_NLS, HAVE_CATGETS,
HAVE_GETTEXT, HAVE_LC_MESSAGES, HAVE_STPCPY): Remove, handled by
autoheader.
* Makefile.am (SUBDIRS): Add m4.
(ACLOCAL_AM_FLAGS): New variable.
(AUTOMAKE_OPTIONS): Add check-news.
* src/Makefile.am (bison.simple): Use awk to replace #line lines with
the proper line number and file name.
(DEFS): Propagate the location of bison library files and of the
locale files.
(INCLUDES): Added `-I ..' so that one can compile with srcdir !=
builddir.
* acinclude.m4: Remove, replaced by the directory m4.
* m4/Makefile.am (EXTRA_DIST): New variable.
* m4/gettext.m4: New file, from the fileutils.
* m4/lcmessage.m4: Likewise
* m4/progtest.m4: Likewise.
* m4/bison-decl.m4: New file, extracted from former acinclude.m4.
This commit is contained in:
Akim Demaille
2000-03-16 15:54:46 +00:00
parent f95997e708
commit 8c44d3ec49
11 changed files with 446 additions and 70 deletions

View File

@@ -10,7 +10,12 @@ bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c \
EXTRA_bison_SOURCES = vmsgetargs.c
bison_LDADD = @INTLLIBS@ @ALLOCA@
INCLUDES = -I../intl -I$(top_srcdir)/intl
DEFS = @DEFS@ \
-DXPFILE=\"${datadir}/bison.simple\" \
-DXPFILE1=\"${datadir}/bison.hairy\" \
-DLOCALEDIR=\"${datadir}/locale\"
INCLUDES = -I../intl -I$(top_srcdir)/intl -I..
noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h \
symtab.h system.h types.h getopt.h
@@ -20,8 +25,10 @@ data_DATA = bison.simple bison.hairy
EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
bison.simple: bison.s1 Makefile
-rm -f $@
sed -e "/^#line/ s|bison|$(datadir)/bison|" -e "s/@bison_version@/$(VERSION)/" < $(srcdir)/bison.s1 > $@-tmp
mv $@-tmp $@
sed -e "s/@bison_version@/$(VERSION)/" $(srcdir)/bison.s1 | \
awk '\
/^#line/ { printf "\"#line %d $(datadir)/bison.simple\"\n", NR+1; next }\
{ print }' >$@t
mv $@t $@
DISTCLEANFILES = bison.simple