diff --git a/moz.configure b/moz.configure index 2b5003197ce1..87882d0d31d5 100755 --- a/moz.configure +++ b/moz.configure @@ -408,6 +408,18 @@ def check_prog(*args, **kwargs): return check_prog(*args, **kwargs) +@depends(target, host) +def want_wine(target, host): + return target.kernel == "WINNT" and host.kernel != "WINNT" + + +wine = check_prog( + "WINE", + ["wine64", "wine"], + allow_missing=True, + when=want_wine, + bootstrap="wine/bin", +) check_prog("WGET", ("wget",), allow_missing=True) diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 0c2925b4eb87..39a8713da207 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -2521,18 +2521,3 @@ def oxidized_breakpad(target): set_config("MOZ_OXIDIZED_BREAKPAD", True, when=oxidized_breakpad) set_define("MOZ_OXIDIZED_BREAKPAD", True, when=oxidized_breakpad) - - -# Wine -# ============================================================== -@depends(target, host, compile_environment) -def want_wine(target, host, compile_environment): - return compile_environment and target.kernel == "WINNT" and host.kernel != "WINNT" - - -wine = check_prog( - "WINE", - ["wine64", "wine"], - when=want_wine, - bootstrap="wine/bin", -)