discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4845823d7421faac8f009186c32b75d848142783
commit 4845823d7421faac8f009186c32b75d848142783 Author: Mike Blumenkrantz <[email protected]> Date: Fri Oct 20 09:21:50 2017 -0400 make some find_program() calls non-required in meson build reported by wltjr --- data/etc/meson.build | 4 ++-- meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/etc/meson.build b/data/etc/meson.build index 14baf7253..b76f5d5e7 100644 --- a/data/etc/meson.build +++ b/data/etc/meson.build @@ -28,7 +28,7 @@ else SUSPEND = '/etc/acpi/sleep.sh force' endif else - suspend = find_program('pm-suspend', '/etc/acpi/pm-suspend', '/sbin/pm-suspend', '/usr/sbin/pm-suspend') + suspend = find_program('pm-suspend', '/etc/acpi/pm-suspend', '/sbin/pm-suspend', '/usr/sbin/pm-suspend', required: false) if suspend.found() SUSPEND = suspend.path() endif @@ -41,7 +41,7 @@ else SUSPEND = '/etc/acpi/hibernate.sh force' endif else - hibernate = find_program('pm-hibernate', '/etc/acpi/pm-hibernate', '/sbin/pm-hibernate', '/usr/sbin/pm-hibernate') + hibernate = find_program('pm-hibernate', '/etc/acpi/pm-hibernate', '/sbin/pm-hibernate', '/usr/sbin/pm-hibernate', required: false) if hibernate.found() HIBERNATE = hibernate.path() endif diff --git a/meson.build b/meson.build index a8e6c048a..3bd83bc0d 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ endif e_version = ver.split('.') git_version = '0' -git = find_program('git') +git = find_program('git', required: false) if git.found() == true git_cmd = run_command(git.path(), 'rev-list', '--count', 'HEAD') if git_cmd.returncode() == 0 --
