Alexandre Julliard : makefiles: Create 64-bit winewrapper symlink in the WoW64 build tree.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Nov 26 14:20:39 2018 +0100

makefiles: Create 64-bit winewrapper symlink in the WoW64 build tree.

Signed-off-by: Alexandre Julliard

---

aclocal.m4   | 2 +-
 configure    | 2 +-
 configure.ac | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 289ee92..25ac678 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -257,7 +257,7 @@ dnl
 dnl Usage: WINE_CONFIG_SYMLINK(target,src,files,enable,srcfile)
 dnl
 AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
-m4_ifval([$4],[if test "x$[$4]" != xno; then
+m4_ifval([$4],[if test $4; then
 ])m4_foreach([f],[$3],
 [AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl
 m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl
diff --git a/configure b/configure
index 63f4633..bb2817c 100755
--- a/configure
+++ b/configure
@@ -18977,7 +18977,7 @@ ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls"
 test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls
 ac_config_links="$ac_config_links wine:tools/winewrapper"
 wine_fn_config_symlink wine
-if test "x$enable_win64" != xno; then
+if test "x$enable_win64" != xno -o -n "$with_wine64"; then
 ac_config_links="$ac_config_links wine64:tools/winewrapper"
 wine_fn_config_symlink wine64
 fi
diff --git a/configure.ac b/configure.ac
index 39cabf2..8bf5e10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2832,10 +2832,10 @@ Makefile: $srcdir/Makefile.in config.status $(MAKEDEP)
 depend: $(MAKEDEP) dummy
    $(MAKEDEP)])

-WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts)
+WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],["x$enable_fonts" != xno])
 WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls])
 WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper)
-WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper)
+WINE_CONFIG_SYMLINK(,tools,[wine64],["x$enable_win64" != xno -o -n "$with_wine64"],winewrapper)

WINE_CONFIG_MAKEFILE(dlls/acledit)
 WINE_CONFIG_MAKEFILE(dlls/aclui)