From e3a054a3828f1af40afd10bd4d0d4dd202745b10 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 18 Dec 2021 17:22:01 +0100 Subject: [PATCH] libtextstyle-optional: Fix generation of textstyle.h (regr. 2021-12-15). * m4/libtextstyle-optional.m4 (gl_LIBTEXTSTYLE_OPTIONAL): Invoke gl_CONDITIONAL_HEADER. --- ChangeLog | 6 ++++++ m4/libtextstyle-optional.m4 | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 07fce5e48b..0dcd3c0dca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-12-18 Bruno Haible + + libtextstyle-optional: Fix generation of textstyle.h (regr. 2021-12-15). + * m4/libtextstyle-optional.m4 (gl_LIBTEXTSTYLE_OPTIONAL): Invoke + gl_CONDITIONAL_HEADER. + 2021-12-18 Bruno Haible Fix support for --gnu-make in tests (regression 2021-12-15). diff --git a/m4/libtextstyle-optional.m4 b/m4/libtextstyle-optional.m4 index 74a5aeaf28..2b29ae4a5d 100644 --- a/m4/libtextstyle-optional.m4 +++ b/m4/libtextstyle-optional.m4 @@ -1,4 +1,4 @@ -# libtextstyle-optional.m4 serial 3 +# libtextstyle-optional.m4 serial 4 dnl Copyright (C) 2019-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,4 +29,11 @@ AC_DEFUN([gl_LIBTEXTSTYLE_OPTIONAL], AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS_ONCE([tcdrain]) fi + + dnl Update the value of the TEXTSTYLE_H variable and the + dnl GL_GENERATE_TEXTSTYLE_H conditional. + dnl In most modules, the gl_CONDITIONAL_HEADER invocation belongs in the + dnl module description, not the .m4 file. But here it's OK, because it does + dnl not make sense to AC_REQUIRE([gl_LIBTEXTSTYLE_OPTIONAL]). + gl_CONDITIONAL_HEADER([textstyle.h]) ]) -- 2.39.5