From d3bd3e04004d682a8c5f07e69fb20f61dc5a8871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 21 May 2018 11:35:05 +0100 Subject: [PATCH] meson: add install_plugins_helper option --- meson.build | 9 ++++++++- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 21a57e5334..2d1a2b9c7c 100644 --- a/meson.build +++ b/meson.build @@ -121,10 +121,17 @@ core_conf.set_quoted('PACKAGE', 'gst-plugins-base') core_conf.set_quoted('VERSION', gst_version) core_conf.set_quoted('PACKAGE_VERSION', gst_version) core_conf.set_quoted('GST_API_VERSION', api_version) -core_conf.set_quoted('GST_INSTALL_PLUGINS_HELPER', 'FIXME') core_conf.set_quoted('GST_DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) core_conf.set_quoted('GST_LICENSE', 'LGPL') +install_plugins_helper = get_option('install_plugins_helper') +if install_plugins_helper == '' + install_plugins_helper = join_paths(get_option('prefix'), + get_option('libexecdir'), + 'gst-install-plugins-helper') +endif +core_conf.set_quoted('GST_INSTALL_PLUGINS_HELPER', install_plugins_helper) + warning_flags = [ '-Wmissing-declarations', '-Wredundant-decls', diff --git a/meson_options.txt b/meson_options.txt index 7b493dcdb4..425f5d08a2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,6 +14,8 @@ option('opengl_module_name', type : 'string', value : '', description : 'The file to pass to g_module_open to open the libGL library (default: libGL)') option('gles2_module_name', type : 'string', value : '', description : 'The file to pass to g_module_open to open the libGLESv2 library (default: libGLESv2)') +option('install_plugins_helper', type: 'string', value: '', + description: 'Path of distro helper script to call to install missing plugins') # Common options option('orc', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', yield : true)