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>

diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
index 09d26ebd6d8fd463ba224fcb56c8a72c1d926acf..29632d4d99b8286529703493301c42843a5c4f95 100644 (file)
--- a/pidl/lib/wscript_build
+++ b/pidl/lib/wscript_build
@@ -28,10 +28,6 @@ bld.INSTALL_FILES(bld.env.VENDORDIR_PERL,
                   Parse/Pidl/Samba3/ServerNDR.pm
                   Parse/Pidl/Compat.pm
                   Parse/Pidl/NDR.pm
+                  Parse/Yapp/Driver.pm
                   ''',
                   flat=False)
-
-if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'):
-    bld.INSTALL_FILES(bld.env.VENDORDIR_PERL,
-                      'Parse/Yapp/Driver.pm',
-                      flat=False)

diff --git a/pidl/wscript b/pidl/wscript
index c7b72c400ff9e4f394436cae65af2d96dba3e323..77abb019de9bd5675c37ad1c8d3f969dc51a0b6d 100644 (file)
--- 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