Skip to content

Commit 5897684

Browse files
committed
Update after gnulib changed.
* gnulib-local/m4/alloca.m4 (gl_FUNC_ALLOCA): Set GL_GENERATE_ALLOCA_H instead of ALLOCA_H. Drop AC_SUBST and AM_CONDITIONAL invocations.
1 parent 05b20c9 commit 5897684

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
/srclib/sys_stat.in.h
122122
/srclib/sys_types.in.h
123123
/srclib/time.in.h
124+
/srclib/unictype/bitmap.h
124125
/srclib/unistd.c
125126
/srclib/unistd.in.h
126127
/srclib/unitypes.in.h
@@ -136,6 +137,8 @@
136137
/srclib/xstrdup.c
137138
/srclib/uniwidth/cjk.h
138139
/srclib/uniwidth/width.c
140+
/srclib/uniwidth/width0.h
141+
/srclib/uniwidth/width2.h
139142
/srcm4/00gnulib.m4
140143
/srcm4/__inline.m4
141144
/srcm4/absolute-header.m4
@@ -226,6 +229,7 @@
226229
/srcm4/time_h.m4
227230
/srcm4/unistd_h.m4
228231
/srcm4/unlocked-io.m4
232+
/srcm4/vararrays.m4
229233
/srcm4/visibility.m4
230234
/srcm4/warn-on-use.m4
231235
/srcm4/wchar_h.m4

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2022-01-04 Bruno Haible <bruno@clisp.org>
2+
3+
Update after gnulib changed.
4+
* gnulib-local/m4/alloca.m4 (gl_FUNC_ALLOCA): Set GL_GENERATE_ALLOCA_H
5+
instead of ALLOCA_H. Drop AC_SUBST and AM_CONDITIONAL invocations.
6+
17
2021-09-19 Bruno Haible <bruno@clisp.org>
28

39
tests: Avoid check-subst failures in QEMU user-mode environments.

gnulib-local/m4/alloca.m4

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# alloca.m4 serial 4 (gettext-0.18.2)
2-
dnl Copyright (C) 2002-2003, 2006, 2011 Free Software Foundation, Inc.
1+
# alloca.m4 serial 5
2+
dnl Copyright (C) 2002-2003, 2006, 2011, 2021-2022 Free Software Foundation, Inc.
33
dnl This file is free software; the Free Software Foundation
44
dnl gives unlimited permission to copy and/or distribute it,
55
dnl with or without modifications, as long as this notice is preserved.
@@ -22,10 +22,8 @@ AC_DEFUN([gl_FUNC_ALLOCA],
2222
Need own alloca
2323
#endif
2424
],
25-
ALLOCA_H=alloca.h,
26-
ALLOCA_H=)
27-
AC_SUBST([ALLOCA_H])
28-
AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
25+
[GL_GENERATE_ALLOCA_H=true],
26+
[GL_GENERATE_ALLOCA_H=false])
2927
])
3028

3129
# Prerequisites of lib/alloca.c.

0 commit comments

Comments
 (0)