From: Bruno Haible Date: Fri, 14 Jan 2022 22:20:44 +0000 (+0100) Subject: Avoid error "conditional LIBUNISTRING_COMPILE_... was never defined" when option... X-Git-Tag: v1.0~2399 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1a4a0680c84b5a726c8b38c22aa68a049865fa31;p=gnulib.git Avoid error "conditional LIBUNISTRING_COMPILE_... was never defined" when option --conditional-dependencies is used (regression 2022-01-09). Reported by Gavin Smith in . * m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE): Use gl_CONDITIONAL instead of AM_CONDITIONAL. --- diff --git a/ChangeLog b/ChangeLog index c41c2e26c2..93fe05770b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2022-01-14 Bruno Haible + + Avoid error "conditional LIBUNISTRING_COMPILE_... was never defined" + when option --conditional-dependencies is used (regression 2022-01-09). + Reported by Gavin Smith in + . + * m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE): Use gl_CONDITIONAL + instead of AM_CONDITIONAL. + 2022-01-13 Bruno Haible Avoid warning "_GL_ATTRIBUTE_DEALLOC_FREE redefined" (regr. 2022-01-04). diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index 3815b3e355..a0892da4a6 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,4 +1,4 @@ -# libunistring-base.m4 serial 6 +# libunistring-base.m4 serial 7 dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ AC_DEFUN([gl_LIBUNISTRING_MODULE], AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from dnl gl_LIBUNISTRING_CORE if that macro has been run. - AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]), + gl_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]), [gl_LIBUNISTRING_VERSION_CMP([$1])]) ])