From 7bda1c95f5ace75f25b0f83fe03e1932a1d4e692 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Sun, 2 Feb 2020 16:05:38 +1300 Subject: [PATCH] pidl/wscript: configure should insist on Parse::Yapp::Driver following 83ffe6752d589180eac96d7b8e7d1a54e3476bfd, you get a build error if you lack a system perl Parse::Yapp. Let's make it a configure failure instead. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14284 Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sun Feb 2 10:09:11 UTC 2020 on sn-devel-184 (cherry picked from commit af47a77673f58cc6436798b250c90be0e325d20e) --- pidl/wscript | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pidl/wscript b/pidl/wscript index d1b8278990a..88cb9132fd6 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -2,7 +2,7 @@ import os, string from samba_utils import MODE_755 -from waflib import Logs +from waflib import Logs, Errors # This function checks if a perl module is installed on the system. def check_system_perl_module(conf, module, version=None): @@ -30,10 +30,14 @@ def options(opt): def configure(conf): # Check if perl(Parse::Yapp::Driver) is available. - check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05) + if not check_system_perl_module(conf, + "Parse::Yapp::Driver", + 1.05): + raise Errors.WafError('perl module "Parse::Yapp::Driver" not found') # yapp is used for building the parser - conf.find_program('yapp', var='YAPP') + if not conf.find_program('yapp', var='YAPP'): + raise Errors.WafError('yapp not found') def build(bld): -- 2.20.1