Revert "buildtools: Add perl vendorlib configure option."
authorMichael Adam <obnox@samba.org>
Thu, 4 Sep 2014 10:45:40 +0000 (12:45 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 8 Sep 2014 22:39:07 +0000 (00:39 +0200)
This reverts commit 48f0183dbeddd7bdf333a40fe0d3e1c7e7fe00f2.

We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
buildtools/wafadmin/Tools/perl.py

index 8f13e2892714b6a6f745a8a9e47ceb110548d34a..99e0540ca3a3f0573b5291df01bf89bd104c8e54 100644 (file)
@@ -103,11 +103,6 @@ def check_perl_ext_devel(conf):
        else:
                conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
 
-       if getattr(Options.options, 'perl_vendorlib_dir', None):
-               conf.env.PERL_VENDORLIB_DIR = Options.options.perl_vendorlib_dir
-       else:
-               conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0]
-
 def set_options(opt):
        opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None)
 
@@ -117,8 +112,3 @@ def set_options(opt):
                       help = ('Specify directory where to install arch specific files'),
                       default=None)
 
-       opt.add_option("--with-perl-vendorlib",
-                      type="string",
-                      dest="perl_vendorlib_dir",
-                      help = ('Specify directory where to install vendor specific files'),
-                      default=None)