diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2018-11-30 16:58:47 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2019-01-11 10:26:46 +0100 |
| commit | 5fb074785ec5ee8f7a9f162766dd4462ebf0a149 (patch) | |
| tree | e05cb3dab9cf00bfee741e5e16c8756a198b54aa /src | |
| parent | c26d938f18d4c92ec515e82037eda42b0e2999ef (diff) | |
Revert "meson: Use feature for GStreamer and make it auto"rhel-8.0
This reverts commit 795b352cbaf68ce6f05ab9e9d46d4eff39ffee14.
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/meson.build | 3 | ||||
| -rw-r--r-- | src/meson.build | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/daemon/meson.build b/src/daemon/meson.build index f2a327fb..4a7d9536 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -13,11 +13,12 @@ pipewire_c_args = [ '-DG_LOG_DOMAIN=g_log_domain_pipewire', ] +conf_config = configuration_data() conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire') configure_file(input : 'pipewire.conf.in', output : 'pipewire.conf', - copy : true, + configuration : conf_config, install_dir : conf_install_dir) diff --git a/src/meson.build b/src/meson.build index 723e2c69..0ad7778d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -6,6 +6,6 @@ subdir('tools') subdir('modules') subdir('examples') -if build_gst +if get_option('gstreamer') subdir('gst') endif |