configure: Create a few symlinks needed for running in Wow64 mode inside the build...

diff --git a/configure b/configure
index b02fe65328cb88884523bbe3420e5801094b3b38..f133705f512eed14d8ce8b3c1a0a188a6d99fdc9 100755 (executable)
--- a/configure
+++ b/configure
@@ -14713,6 +14713,18 @@ ac_config_commands="$ac_config_commands Makefile"
 ac_config_files="$ac_config_files Make.tmp:Makefile.in"
 
 
+
+if test -n "$with_wine64"
+then
+wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine32
+fonts server:
+       \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
+$with_wine64/loader/wine32:
+       \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine32 \$@
+clean::
+       \$(RM) fonts server $with_wine64/loader/wine32"
+fi
+
 wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall::
        -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)"
 

diff --git a/configure.ac b/configure.ac
index 25a1313ff4d2b01ef8beda91fb09fa178b272b2a..349a25a1d57cafc49927e30f208cdcf776b30093 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2713,6 +2713,19 @@ _WINE_EOF
 AC_CONFIG_FILES([Make.tmp:Makefile.in])
 
 dnl Some final makefile rules
+
+if test -n "$with_wine64"
+then
+WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
+[all: fonts server $with_wine64/loader/wine32
+fonts server:
+       \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
+$with_wine64/loader/wine32:
+       \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine32 \$[@]
+clean::
+       \$(RM) fonts server $with_wine64/loader/wine32])
+fi
+
 WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
 [uninstall::
        -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)])