diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2021-07-13 11:12:22 -0500 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2021-07-13 11:26:59 -0500 |
| commit | cbb0927a7a9113d3b6b772e7b0566752dd54e6dd (patch) | |
| tree | cae52705307854fdf61f863f9c019f1e1fc81102 /src/common | |
| parent | 25440a07c3b421134b4376d7db3ee4b7ed57ad98 (diff) | |
build: Misc cleanup of options
Cleanup of option names, use features where applicable, and printing of summary.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/dbus/meson.build | 2 | ||||
| -rw-r--r-- | src/common/meson.build | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/common/dbus/meson.build b/src/common/dbus/meson.build index 69066be0..856bbe55 100644 --- a/src/common/dbus/meson.build +++ b/src/common/dbus/meson.build @@ -1,5 +1,5 @@ dbus_deps = [ - dependency('dbus-glib-1') + dbus_glib_dep ] dbus_sources = [ diff --git a/src/common/meson.build b/src/common/meson.build index 09491e84..6ca0f20c 100644 --- a/src/common/meson.build +++ b/src/common/meson.build @@ -28,6 +28,7 @@ common_sysinfo_deps = [] common_deps = [ libgio_dep, + libcanberra_dep, ] + global_deps common_includes = [ @@ -72,22 +73,18 @@ textevents = custom_target('textevents', # SIGACTION # HAVE_GTK_MAC -if get_option('with-ssl') +if libssl_dep.found() common_sources += 'ssl.c' common_deps += libssl_dep endif -if get_option('with-libcanberra') - common_deps += dependency('libcanberra', version: '>= 0.22') -endif - -if get_option('with-dbus') +if dbus_glib_dep.found() subdir('dbus') common_deps += hexchat_dbus_dep common_includes += include_directories('dbus') endif -if get_option('with-plugin') +if get_option('plugin') common_deps += libgmodule_dep install_headers('hexchat-plugin.h') endif |