configure: Don't create makefiles in directories that are symlinks in a Wow64 build.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

configure: Don't create makefiles in directories that are symlinks in a Wow64 build.
c6d6dcee · Alexandre Julliard · eee837e9 · c6d6dcee · c6d6dcee · c6d6dcee
Commit c6d6dcee authored Mar 07, 2016 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 6 deletions

aclocal.m4 aclocal.m4 +4 -0

configure configure +6 -3

configure.ac configure.ac +3 -3

No files found.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -299,6 +299,10 @@ wine_fn_config_makefile ()
    ac_enable=$[2]
    ac_flags=$[3]
+    case $ac_dir in
+    dnl These are created as symlinks for wow64 builds
+    fonts|server) test -z "$with_wine64" || return ;;
+    esac
    AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return])
    wine_fn_all_rules
    wine_fn_install_rules

--- a/configure
+++ b/configure
@@ -7511,6 +7511,9 @@ wine_fn_config_makefile ()
    ac_enable=$2
    ac_flags=$3
+    case $ac_dir in
+        fonts|server) test -z "$with_wine64" || return ;;
+    esac
    if eval test \"x\$"$ac_enable"\" = x"no"; then :
  wine_fn_disabled_rules; return
 fi
@@ -18263,15 +18266,15 @@ fi
 if test -n "$with_wine64"
 then
-    wine_fn_append_rule "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+    wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-fonts server tools:
+fonts server:
 	\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
 $with_wine64/loader/wine:
 	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
 $with_wine64/loader/wine-preloader:
 	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
 clean::
-	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
+	\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
 else
    WINELOADER_INSTALL="wine.inf"

--- a/configure.ac
+++ b/configure.ac
@@ -3596,15 +3596,15 @@ fi
 if test -n "$with_wine64"
 then
    WINE_APPEND_RULE(
-[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-fonts server tools:
+fonts server:
 	\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
 $with_wine64/loader/wine:
 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
 $with_wine64/loader/wine-preloader:
 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
 clean::
-	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
+	\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
 else
    AC_SUBST(WINELOADER_INSTALL,"wine.inf")
    WINE_APPEND_RULE(