build: cleanup dependency checking

We always require polkit now, so that we can fallback when we fail to
communicate with the peer.
This commit is contained in:
Christian Hergert
2019-05-10 12:53:19 -07:00
parent eacdc47c34
commit 623d7ad027
5 changed files with 21 additions and 15 deletions

View File

@ -30,7 +30,7 @@ configure_file(
)
libsysprof_capture_deps = [
dependency('glib-2.0', version: glib_req_version),
glib_dep,
]
libsysprof_capture = static_library(

View File

@ -54,8 +54,8 @@ libsysprof_ui_resources = gnome.compile_resources(
)
libsysprof_ui_deps = [
dependency('gio-2.0', version: glib_req_version),
dependency('gtk+-3.0', version: gtk_req_version),
gio_dep,
gtk_dep,
libsysprof_dep,
]

View File

@ -58,8 +58,9 @@ libsysprof_public_sources += libsysprof_capture_sources
libsysprof_public_headers += libsysprof_capture_headers
libsysprof_deps = [
dependency('gio-2.0', version: glib_req_version),
dependency('gio-unix-2.0', version: glib_req_version),
gio_dep,
gio_unix_dep,
polkit_dep,
]
if host_machine.system() == 'linux'
@ -89,10 +90,6 @@ if host_machine.system() != 'darwin'
libsysprof_deps += [cxx.find_library('stdc++')]
endif
if get_option('with_sysprofd') != 'none'
libsysprof_deps += dependency('polkit-gobject-1')
endif
libsysprof = shared_library(
'sysprof-@0@'.format(libsysprof_api_version),
libsysprof_public_sources + libsysprof_private_sources,

View File

@ -10,10 +10,10 @@ sysprofd_sources = [
pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
sysprofd_deps = [
dependency('glib-2.0', version: glib_req_version),
dependency('gio-2.0', version: glib_req_version),
dependency('gio-unix-2.0', version: glib_req_version),
dependency('polkit-gobject-1', version: polkit_req_version),
glib_dep,
gio_dep,
gio_unix_dep,
polkit_dep,
]
sysprofd = executable('sysprofd', sysprofd_sources,