mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-20 17:53:02 +00:00
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:
20
configure.in
20
configure.in
@@ -1,8 +1,10 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(src/reduce.c)
|
||||
AM_INIT_AUTOMAKE(bison,1.29)
|
||||
AM_CONFIG_HEADER(config.h:config.hin)
|
||||
AC_PREREQ(2.13)
|
||||
AC_INIT(src/reduce.c)
|
||||
AM_INIT_AUTOMAKE(bison, 1.28a)
|
||||
AM_CONFIG_HEADER(config.h:config.hin)
|
||||
AC_DEFINE_UNQUOTED(VERSION_STRING, "GNU Bison version ${VERSION}",
|
||||
[The version string.])
|
||||
|
||||
ALL_LINGUAS="de es fr nl ru"
|
||||
|
||||
@@ -39,12 +41,6 @@ AM_GNU_GETTEXT
|
||||
# the ANSI2KNR-filtering rules.
|
||||
LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
|
||||
|
||||
AC_DEFINE_UNQUOTED(VERSION_STRING, "GNU Bison version ${VERSION}")
|
||||
XPFILE="${datadir}/bison.simple"
|
||||
BISON_DEFINE_FILE(XPFILE, XPFILE)
|
||||
XPFILE1="${datadir}/bison.hairy"
|
||||
BISON_DEFINE_FILE(XPFILE1, XPFILE1)
|
||||
LOCALEDIR="${datadir}/locale"
|
||||
BISON_DEFINE_FILE(LOCALEDIR, LOCALEDIR)
|
||||
|
||||
AC_OUTPUT(Makefile intl/Makefile po/Makefile.in src/Makefile doc/Makefile)
|
||||
AC_OUTPUT([Makefile
|
||||
intl/Makefile po/Makefile.in
|
||||
src/Makefile doc/Makefile m4/Makefile])
|
||||
|
||||
Reference in New Issue
Block a user