From 6a023e943e712e0a4bd83019e72d6cb64d38ed3f Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 24 Mar 2021 09:45:29 +0100 Subject: [PATCH] meson: Print custom message when GNU grep is not installed Currently, if GNU grep is not installed on a FreeBSD system the configuration step will fail with Program grep found: YES (/usr/bin/grep) Program /usr/local/bin/grep found: NO ERROR: Program '/usr/local/bin/grep' not found which is confusing and not very useful; after this change, the message will be Program grep found: YES (/usr/bin/grep) Program /usr/local/bin/grep found: NO ERROR: Problem encountered: GNU grep not found instead, which should do a better job helping the user figure out that they need to install GNU grep from ports to proceed. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- build-aux/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index c44ed6821c..06b7a7c01f 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -18,7 +18,10 @@ if host_machine.system() == 'freebsd' grep_cmd = run_command(grep_prog, '--version') if grep_cmd.stdout().startswith('grep (BSD grep') - grep_prog = find_program('/usr/local/bin/grep') + grep_prog = find_program('/usr/local/bin/grep', required: false) + if not grep_prog.found() + error('GNU grep not found') + endif grep_cmd = run_command(grep_prog, '--version') if grep_cmd.stdout().startswith('grep (BSD grep') error('GNU grep not found')