]> Savannah Git Hosting - gnulib.git/commitdiff
Avoid error "conditional LIBUNISTRING_COMPILE_... was never defined" when option...
authorBruno Haible <bruno@clisp.org>
Fri, 14 Jan 2022 22:20:44 +0000 (23:20 +0100)
committerBruno Haible <bruno@clisp.org>
Fri, 14 Jan 2022 22:20:44 +0000 (23:20 +0100)
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.

ChangeLog
m4/libunistring-base.m4

index c41c2e26c242f56d12064260c04412eb10430d50..93fe05770baeddd148920af33f6003cafc381684 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2022-01-13  Bruno Haible  <bruno@clisp.org>
 
        Avoid warning "_GL_ATTRIBUTE_DEALLOC_FREE redefined" (regr. 2022-01-04).
index 3815b3e3552d10b1385ce293cb4f9292f43c2427..a0892da4a6360995cadee5590033e9b632885789 100644 (file)
@@ -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])])
 ])