networkAgent: Pick up VPN service dir from pkg-config

It turns out that NetworkManager does export the directory as pkg-config
variable after all, so use that instead of building the path ourselves
from the prefix.

https://bugzilla.gnome.org/show_bug.cgi?id=789811
This commit is contained in:
Florian Müllner 2018-01-21 21:04:37 +01:00
parent fed5657b40
commit 1d3154a89e
4 changed files with 7 additions and 10 deletions

View file

@ -105,16 +105,13 @@ if get_option('networkmanager')
nm_deps += dependency('libnm', version: nm_req)
nm_deps += dependency('libsecret-1', version: secret_req)
vpndir = nm_deps[0].get_pkgconfig_variable('vpnservicedir')
have_networkmanager = true
else
have_networkmanager = false
endif
vpndir = prefix
networkmanager_dep = dependency('NetworkManager', required: false)
if (networkmanager_dep.found())
nm_prefix = networkmanager_dep.get_pkgconfig_variable('prefix')
else
nm_prefix = prefix
have_networkmanager = false
endif
if get_option('systemd')