Sergei Trofimovich : aclocal.m4: Fix compatibility with upcoming autoconf-2.70.

Alexandre Julliard julliard at winehq.org
Fri Oct 30 16:18:42 CDT 2020


Module: wine
Branch: master
Commit: d7645b67c350f7179a1eba749ec4524c74948d86
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d7645b67c350f7179a1eba749ec4524c74948d86

Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Thu Oct 29 22:51:57 2020 +0000

aclocal.m4: Fix compatibility with upcoming autoconf-2.70.

Under autoconf 2.69c (beta) `./configure` fails as:

```
./configure
...
checking for msgfmt... msgfmt
./configure: line 7441: syntax error near unexpected token `newline'
./configure: line 7441: `    '''
```

This happens due to underquoting of a snippet
argument for `AS_VAR_SET_IF` call.

Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 aclocal.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index c5edd85cee4..bd8ca6b33e5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name
 dnl
 AC_DEFUN([WINE_CHECK_HOST_TOOL],
 [AS_VAR_SET_IF([ac_tool_prefix],
-  AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4]))
+  [AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])])
 AS_VAR_IF([ac_cv_prog_$1],[],
   [AS_VAR_IF([cross_compiling],[yes],[],
     [AS_UNSET([ac_cv_prog_$1])




More information about the wine-cvs mailing list