Skip to content

Commit

Permalink
#1332: add support for building without mdns
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@14012 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 6, 2016
1 parent 8644d2c commit 814d7c2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/setup.py
Expand Up @@ -158,6 +158,7 @@ def is_msvc():
sound_ENABLED = DEFAULT
printing_ENABLED = DEFAULT
crypto_ENABLED = DEFAULT
mdns_ENABLED = DEFAULT

enc_proxy_ENABLED = DEFAULT
enc_x264_ENABLED = DEFAULT and pkg_config_ok("--exists", "x264", fallback=WIN32)
Expand Down Expand Up @@ -218,7 +219,7 @@ def is_msvc():
"dec_avcodec2", "csc_swscale",
"csc_opencl", "csc_cython", "csc_opencv", "csc_libyuv",
"memoryview",
"bencode", "cython_bencode", "vsock",
"bencode", "cython_bencode", "vsock", "mdns",
"clipboard",
"server", "client", "dbus", "x11", "gtk_x11",
"gtk2", "gtk3", "html5", "pam",
Expand Down Expand Up @@ -807,7 +808,7 @@ def bstr(b):
def pretty_cmd(cmd):
return " ".join(cmd)
#no python-avahi on RH / CentOS, need dbus module on *nix:
mdns = OSX or WIN32 or (not is_RH() and dbus_ENABLED)
mdns = mdns_ENABLED and (OSX or WIN32 or (not is_RH() and dbus_ENABLED))
SUBS = {
'xvfb_command' : pretty_cmd(xvfb_command),
'ssh_command' : DEFAULT_SSH_COMMAND,
Expand Down Expand Up @@ -1899,6 +1900,7 @@ def osx_pkgconfig(*pkgs_options, **ekw):


toggle_packages(dbus_ENABLED, "xpra.dbus")
toggle_packages(mdns_ENABLED, "xpra.net.mdns")
toggle_packages(server_ENABLED or proxy_ENABLED or shadow_ENABLED, "xpra.server", "xpra.server.auth")
toggle_packages(proxy_ENABLED, "xpra.server.proxy")
toggle_packages(server_ENABLED, "xpra.server.window")
Expand Down

0 comments on commit 814d7c2

Please sign in to comment.