#1521 only disable socket activation on Ubuntu 16.04, other distros a…

…re fine - even with older versions of systemd

git-svn-id: https://xpra.org/svn/Xpra/trunk@16815 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/setup.py

@@ -95,7 +95,7 @@
 # using --with-OPTION or --without-OPTION
 # only the default values are specified here:
 #*******************************************************************************
-from xpra.os_util import get_status_output
+from xpra.os_util import get_status_output, is_Ubuntu, is_Debian, is_Raspbian, getUbuntuVersion
 
 PKG_CONFIG = os.environ.get("PKG_CONFIG", "pkg-config")
 has_pkg_config = False
@@ -150,7 +150,7 @@ def is_RH():
 server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and not (PYTHON3 and LINUX) and DEFAULT
 rfb_ENABLED = server_ENABLED
 service_ENABLED = LINUX and server_ENABLED
-sd_listen_ENABLED = POSIX and pkg_config_version("230", "libsystemd")
+sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") and (not is_Ubuntu() or getUbuntuVersion()>[16, 4])
 proxy_ENABLED  = DEFAULT
 client_ENABLED = DEFAULT
 
@@ -709,7 +709,6 @@ def exec_pkgconfig(*pkgs_options, **ekw):
                     ]
         elif get_gcc_version()>=[4, 4]:
             eifd = ["-Werror"]
-            from xpra.os_util import is_Ubuntu, is_Debian, is_Raspbian
             if is_Debian() or is_Ubuntu() or is_Raspbian():
                 #needed on Debian and Ubuntu to avoid this error:
                 #/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes]
@@ -846,7 +845,6 @@ def pretty_cmd(cmd):
         return " ".join(cmd)
     #OSX doesn't have webcam support yet (no opencv builds on 10.5.x)
     #Ubuntu 16.10 has opencv builds that conflict with our private ffmpeg
-    from xpra.os_util import getUbuntuVersion
     webcam = webcam_ENABLED and not (OSX or getUbuntuVersion()==[16, 10])
     #no python-avahi on RH / CentOS, need dbus module on *nix:
     mdns = mdns_ENABLED and (OSX or WIN32 or (not is_RH() and dbus_ENABLED))