From 68fbecc49be8076f14ba241f80b1a33a59d8d048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
Date: Mon, 14 Oct 2024 17:25:07 +0200
Subject: [PATCH] libtool: Handle unset $multilib for Windows targets.

If `multilib` is unset (which it apparently is by default), the output
from running a `configure` script contains lines like the following:
```
checking dynamic linker characteristics... ../configure: line 26791: test: yes: unary operator expected
Win32 ld.exe
```

The additional output is not a fatal error. But it could be irritating.

Avoid the unexpected output from `test` by making sure `=` is used as a
binary operator.

* m4/libtool.m4: Prepend "x" on both sides of a comparison with `test`
and the operator `=`.
* NEWS: Update for bug fix.

See also: https://github.com/msys2/MINGW-packages/pull/21905
---
 NEWS          | 2 ++
 m4/libtool.m4 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c83ad75b..2e87652a 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ NEWS - list of user-visible changes between releases of GNU Libtool
   - Fix bug where the constructed rpath omit directories, instead of
     appending them to the end.
 
+  - Fix configure error for when variable 'multlib' is unset.
+
 
 * Noteworthy changes in release 2.5.3 (2024-09-25) [stable]
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 5f701b70..070cb29d 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2584,7 +2584,7 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     # If user builds GCC with mulitlibs enabled,
     # it should just install on $(libdir)
     # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
-    if test yes = $multilib; then
+    if test xyes = x$multilib; then
     postinstall_cmds='base_file=`basename \$file`~
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~