ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-03-07 16:26:42 +09:00
parent eee837e931
commit c6d6dcee47
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aclocal.m4 vendored
View File

@ -299,6 +299,10 @@ wine_fn_config_makefile ()
ac_enable=$[2] ac_enable=$[2]
ac_flags=$[3] 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]) AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return])
wine_fn_all_rules wine_fn_all_rules
wine_fn_install_rules wine_fn_install_rules

9
configure vendored
View File

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

6
configure.ac
View File

@ -3596,15 +3596,15 @@ fi
if test -n "$with_wine64" if test -n "$with_wine64"
then then
WINE_APPEND_RULE( 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/\$[@] \$[@] \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
$with_wine64/loader/wine: $with_wine64/loader/wine:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
$with_wine64/loader/wine-preloader: $with_wine64/loader/wine-preloader:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
clean:: 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 else
AC_SUBST(WINELOADER_INSTALL,"wine.inf") AC_SUBST(WINELOADER_INSTALL,"wine.inf")
WINE_APPEND_RULE( WINE_APPEND_RULE(