Re: conditional "LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH" was never defined.

[Bruno Haible]

Gavin Smith wrote:
> I am trying to update Texinfo to use the latest gnulib code.
> 
> After running gnulib --add-import and running configure,

I could reproduce it like this:
  $ cd texinfo
  $ $GNULIB_SRCDIR/gnulib-tool  --add-import
  $ ./autogen.sh
  $ ./configure

The following patch fixes it. The cause is that texinfo is using the
gnulib-tool option --conditional-dependencies, and a couple of days
ago I made this option more effective.


2022-01-14  Bruno Haible  <bruno@clisp.org>

        Avoid error "conditional LIBUNISTRING_COMPILE_... was never defined"
        when option --conditional-dependencies is used (regression 2022-01-09).
        Reported by Gavin Smith <gavinsmith0123@gmail.com> in
        <https://lists.gnu.org/archive/html/bug-gnulib/2022-01/msg00099.html>.
        * m4/libunistring-base.m4 (gl_LIBUNISTRING_MODULE): Use gl_CONDITIONAL
        instead of AM_CONDITIONAL.

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])])
 ])