mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-16 07:43:03 +00:00
Use some of gnulib's new modules, taken from coreutils.
* bootstrap: Sync from coreutils, except add support for gnulib_files. * bootstrap.conf: New file. (gnulib_modules): Add configmake, inttypes, unistd. (XGETTEXT_OPTIONS): Add complain, complain_at, fatal, fatal_at, warn, warn_at, unexpected_end. * configure.ac (AC_CONFIG_HEADERS): config.h is now in lib, not here. (gl_USE_SYSTEM_EXTENSIONS): Remove; gl_EARLY now does this. (gl_EARLY): Add. (AM_STDBOOL_H): Remove; gl_INIT now dows this. (gl_INIT): Add (GNULIB_AUTOCONF_SNIPPET): Remove. (AM_GNU_GETTEXT): Add; require formatstring macros since that's the pickiest. * lib/.cvsignore: Add inttypes_.h. * lib/Makefile.am: Include gnulib.mk first so we can append to it. (AM_CFLAGS): Add WERROR_CFLAGS, to be more like coreutils. (BUILT_SOURCES, EXTRA_DIST, MOSTLYCLEANFILES): Remove no-longer-necessary initializations. (lib_SOURCES): Remove, replacing by libbison_a_SOURCES. * lib/subpipe.c: Include <unistd.h> unconditionally, now that we use the unistd module. * src/system.h: Likewise. * m4/.cvsignore: Remove *_gl.m4, gnulib.m4, inttypes_h.m4, uintmax_t.m4, ulonglong.m4. Add gettext.m4, gnulib-cache.m4, gnulib-comp.m4, gnulib-tool.m4, inttypes-h.m4, inttypes-pri.m4, inttypes.m4. * src/Makefile.am (DEFS): Remove, since configmake does this for us. (AM_CPPFLAGS): Remove -I../lib, since Automake does that for us. * src/system.h: Include inttypes.h unconditionally, now that we use the inttypes module. Don't bother to include stdint.h, since inttypes.h now does that for us. (LOCALEDIR): Remove, now that we use the configmake module. * src/getargs.c: Include configmake.h. * src/main.c: Likewise. * src/output.c: Likewise. * tests/atlocal.in (CPPFLAGS): Include from $abs_top_builddir/lib, not from $abs_top_builddir, since config.h moved.
This commit is contained in:
17
configure.ac
17
configure.ac
@@ -27,13 +27,15 @@ AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
# We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.
|
||||
AM_INIT_AUTOMAKE([1.8 check-news readme-alpha dist-bzip2])
|
||||
AC_CONFIG_HEADERS([config.h:config.hin])
|
||||
|
||||
gl_USE_SYSTEM_EXTENSIONS
|
||||
AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
|
||||
|
||||
# Checks for the compiler.
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_STDC
|
||||
|
||||
# Gnulib (early checks).
|
||||
gl_EARLY
|
||||
|
||||
AC_ARG_ENABLE(gcc-warnings,
|
||||
[ --enable-gcc-warnings turn on lots of GCC warnings (not recommended)],
|
||||
[case "${enableval}" in
|
||||
@@ -91,20 +93,23 @@ AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the GNU M4 executable name.])
|
||||
|
||||
# Checks for header files.
|
||||
AC_CHECK_HEADERS_ONCE([locale.h])
|
||||
AM_STDBOOL_H
|
||||
|
||||
# Checks for compiler characteristics.
|
||||
AC_C_INLINE
|
||||
|
||||
# Gnulib (later checks). Putting them here rather than right after
|
||||
# gl_EARLY avoids some redundant checks.
|
||||
gl_INIT
|
||||
|
||||
# Checks for library functions.
|
||||
AC_CHECK_FUNCS_ONCE([setlocale])
|
||||
AM_WITH_DMALLOC
|
||||
BISON_PREREQ_SUBPIPE
|
||||
BISON_PREREQ_TIMEVAR
|
||||
|
||||
# gnulib and gettext.
|
||||
GNULIB_AUTOCONF_SNIPPET
|
||||
# Gettext.
|
||||
# We've never tested with gettext versions before 0.15, so play it safe.
|
||||
AM_GNU_GETTEXT([external], [need-formatstring-macros])
|
||||
AM_GNU_GETTEXT_VERSION([0.15])
|
||||
BISON_I18N
|
||||
|
||||
|
||||
Reference in New Issue
Block a user