[libsoup/libsoup-2-74] meson: Add explicit check argument to run_command()
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/libsoup-2-74] meson: Add explicit check argument to run_command()
- Date: Mon, 28 Mar 2022 14:07:13 +0000 (UTC)
commit a8306a10011130f649e3816b9800c3bc691e1212
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Fri Mar 25 23:31:14 2022 +0530
meson: Add explicit check argument to run_command()
Not specifying this is deprecated, since it is prone to errors.
meson.build | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3cc56fb9..4b3267ed 100644
--- a/meson.build
+++ b/meson.build
@@ -232,11 +232,11 @@ apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache',
have_apache=false
apache_httpd2_version = ''
if apache_httpd2.found() and apachectl.found()
- apache_httpd2_version_raw = run_command(apachectl.path(), '-v')
+ apache_httpd2_version_raw = run_command(apachectl.path(), '-v', check: false)
# It seems that from version 2.4.39 apachectl doesn't take arguments, fallback
# to calling apache directly just in case.
if apache_httpd2_version_raw.returncode() != 0
- apache_httpd2_version_raw = run_command(apache_httpd2.path(), '-v')
+ apache_httpd2_version_raw = run_command(apache_httpd2.path(), '-v', check: false)
endif
if apache_httpd2_version_raw.returncode() == 0
apache_httpd2_version = apache_httpd2_version_raw.stdout().split('\n')[0]
@@ -251,11 +251,11 @@ if apache_httpd2.found() and apachectl.found()
endif
if have_apache
- apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apachectl.path())
+ apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apachectl.path(), check: false)
have_apache = (apache_modules_dirs_out.returncode() == 0)
# Same as above, using apachectl might fail, try apache directly.
if not have_apache
- apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apache_httpd2.path())
+ apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apache_httpd2.path(), check: false)
have_apache = (apache_modules_dirs_out.returncode() == 0)
endif
if have_apache
@@ -283,7 +283,7 @@ if have_apache
message(cdata.get('APACHE_PHP_MODULE_FILE'))
if php.found() and cdata.get('APACHE_PHP_MODULE_FILE') != ''
have_php = true
- php_xmlrpc = run_command(php, '-d', 'extension=xmlrpc', '-r',
'exit(function_exists("xmlrpc_server_create")?0:1);')
+ php_xmlrpc = run_command(php, '-d', 'extension=xmlrpc', '-r',
'exit(function_exists("xmlrpc_server_create")?0:1);', check: false)
if php_xmlrpc.returncode() == 0
message('php-xmlrpc found')
have_php_xmlrpc = true
@@ -325,8 +325,8 @@ else
endif
krb5_config = find_program(krb5_config_path, required : gssapi_opt)
if krb5_config.found()
- libs_output = run_command (krb5_config, '--libs', 'gssapi', check: gssapi_opt.enabled())
- cflags_output = run_command (krb5_config, '--cflags', 'gssapi', check: gssapi_opt.enabled())
+ libs_output = run_command(krb5_config, '--libs', 'gssapi', check: gssapi_opt.enabled())
+ cflags_output = run_command(krb5_config, '--cflags', 'gssapi', check: gssapi_opt.enabled())
if libs_output.returncode() == 0 and cflags_output.returncode() == 0
enable_gssapi = true
gssapi_dep = declare_dependency(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]