diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-28 15:45:35 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-03-06 09:59:41 +0100 |
| commit | c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5 (patch) | |
| tree | dd033e86fe702c7d149471e012038fb5f0d0c645 /pidl/wscript | |
| parent | d8e110ed7dacda18860cce0c86e4e44f0b83dd42 (diff) | |
| download | samba-c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5.tar.gz | |
Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."
This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838.
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'pidl/wscript')
| -rw-r--r-- | pidl/wscript | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/pidl/wscript b/pidl/wscript index c7b72c400ff..77abb019de9 100644 --- a/pidl/wscript +++ b/pidl/wscript @@ -1,6 +1,6 @@ #!/usr/bin/env python -import os, sys, Logs, Options +import os, sys, Logs from samba_utils import MODE_755 def set_options(opt): @@ -20,9 +20,6 @@ def configure(conf): conf.find_program('yapp', var='YAPP') conf.find_program('pod2man', var='POD2MAN') - # Check for perl(Parse::Yapp::Driver) - check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05) - def build(bld): bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755) @@ -85,23 +82,3 @@ try this to avoid this message: $ touch ../pidl/lib/Parse/Pidl/IDL.pm ../pidl/lib/Parse/Pidl/Expr.pm ''') -def check_system_perl_module(conf, module, version=None): - bundle_name = module.replace('::', '_') - module_check = module - found = False - - # Create module string with version - if version: - module_check = module + ' ' + str(version) - - # Check if we have to bundle it. - if conf.LIB_MUST_BE_BUNDLED(bundle_name.lower()): - return False - - # Check for system perl module - if not conf.check_perl_module(module_check): - return False - - conf.define('USING_SYSTEM_%s' % bundle_name.upper(), 1) - - return True |