diff options
| author | Michael Adam <obnox@samba.org> | 2014-09-04 12:45:40 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-09-09 00:39:07 +0200 |
| commit | 0b91f7d806b9d18881edb8df981a9eeb057580e5 (patch) | |
| tree | 7e680e16e1b5cea852f9b04543a1aa0ac40aad2a /buildtools | |
| parent | 42990ca3c8fa5752280840ea202a537915680b7d (diff) | |
| download | samba-0b91f7d806b9d18881edb8df981a9eeb057580e5.tar.gz | |
Revert "buildtools: Add perl vendorlib configure option."
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>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafadmin/Tools/perl.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py index 8f13e289271..99e0540ca3a 100644 --- a/buildtools/wafadmin/Tools/perl.py +++ b/buildtools/wafadmin/Tools/perl.py @@ -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) |