mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-15 07:13:02 +00:00
Adjust to Autoconf 2.60 and today's gnulib.
* bootstrap (gnulib_modules): Add stdint. Remove special case for m4/onceonly_2_57.m4, since gnulib-tool no longer copies it. (intl_files_to_remove): Remove m4/longlong.m4 and m4/wchar_t.m4, since stdint needs the former and wcwidth (which is now required by mbswidth) needs the latter. Append 'datarootdir = @datarootdir@' to po/Makefile.in.in, to work around a compatibility glitch between gettext 0.14.6 and Autoconf 2.60. * configure.ac (AC_PREREQ): Require Autoconf 2.60. Do not check for uintptr_t, since new stdint module does the right thing. * lib/.cvsignore: Remove alloca.c, alloca.h, alloca_.h. Add stdint.h, stdint_.h, wcwidth.h. * m4/.cvsignore: Remove alloca.m4, onceonly.m4. Add absolute-header.m4, double-slash-root.m4, longlong.m4, stdint.m4, wchar_t.m4, wcwidth.m4. * src/files.c: Include <dirname.h> and <stdio-safer.h> in the usual order for ../lib/*.h files. (file_name_split): Use last_component, not base_name, to adjust to gnulib changes. * src/parse-gram.h: Include <strverscmp.h> in the usual order for ../lib/*.h files. (YYTYPE_INT16, YYTYPE_INT8, YYTYPE_UINT16, YYTYPE_UINT8): Define unconditionally, since we now assume the stdint module. * src/scan-skel.l: Include <dirname.h>. (BASE_QPUTS): Use last_component, not base_name. * src/system.h: Include <unlocked-io.h> in the usual order for ../lib/*.h files. Include <stdint.h> unconditionally, since we now use the stdint module. (uintptr_t): Declare if UINTPTR_MAX is not defined, not HAVE_UINTPTR_T, since we now use the stdint module. (base_name): Remove decl, since files now include <dirname.h> to get the decl.
This commit is contained in:
10
bootstrap
10
bootstrap
@@ -109,6 +109,7 @@ quote
|
||||
quotearg
|
||||
stdbool
|
||||
stdio-safer
|
||||
stdint
|
||||
stpcpy
|
||||
strerror
|
||||
strtoul
|
||||
@@ -145,7 +146,6 @@ for gnulib_file in $gnulib_files; do
|
||||
dest=$gnulib_file
|
||||
|
||||
case $gnulib_file in
|
||||
m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
|
||||
# These will be overwritten by autopoint, which still uses
|
||||
# old jm_.* macro names, so we have to keep both copies.
|
||||
# m4/gettext.m4 isn't mentioned here, since it's patched below.
|
||||
@@ -261,7 +261,6 @@ intl_files_to_remove='
|
||||
m4/lib-ld.m4
|
||||
m4/lib-prefix.m4
|
||||
m4/longdouble.m4
|
||||
m4/longlong.m4
|
||||
m4/po.m4
|
||||
m4/printf-posix.m4
|
||||
m4/signed.m4
|
||||
@@ -269,7 +268,6 @@ intl_files_to_remove='
|
||||
m4/stdint_h.m4
|
||||
m4/uintmax_t.m4
|
||||
m4/ulonglong.m4
|
||||
m4/wchar_t.m4
|
||||
m4/wint_t.m4
|
||||
m4/xsize.m4
|
||||
'
|
||||
@@ -296,6 +294,12 @@ sed '
|
||||
s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = --keyword=YY_/
|
||||
' <po/Makevars >runtime-po/Makevars
|
||||
|
||||
# Append 'datarootdir = $(prefix)/share' to po/Makefile.in.in to work
|
||||
# around an incompatibility between Autoconf 2.60 and gettext 0.14.6.
|
||||
# This hack can be removed once we assume gettext 0.15 or later.
|
||||
grep datarootdir po/Makefile.in.in >/dev/null ||
|
||||
echo 'datarootdir = @datarootdir@' >>po/Makefile.in.in
|
||||
|
||||
# Copy identical files from po to runtime-po.
|
||||
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user