Skip to content

Commit

Permalink
pidl/wscript: configure should insist on Parse::Yapp::Driver
Browse files Browse the repository at this point in the history
following 83ffe67, 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 <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>

Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Sun Feb  2 10:09:11 UTC 2020 on sn-devel-184

(cherry picked from commit af47a77)
  • Loading branch information
douglasbagnall authored and kseeger committed Feb 20, 2020
1 parent 339566f commit da44630
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pidl/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):

Expand Down

0 comments on commit da44630

Please sign in to comment.