path: root/wscript
diff options
authorwm4 <wm4@nowhere>2016-12-17 13:24:05 +0100
committerwm4 <wm4@nowhere>2016-12-17 15:43:15 +0100
commitff9f5e06ff203c055d968087956026ef9204218b (patch)
tree883725191398913cc97bd441b7110bcf68237e28 /wscript
parent2b8b17402ed59815019b309051b277ba4de82f3b (diff)
Revert "Port several python scripts to Perl"
This reverts commit fae73079310eef9dce9737f2e37ff4b80c8830ee. Before the waf build system was used, we had a configure script written in shell. To drop the build dependency on Python, someone rewrote the Python scripts we had to Perl. Now the shell configure script is gone, and it makes no sense to have a build dependency on both Perl and Python. This isn't just a straight revert. It adds the new Matroska EBML elements to the old Python scripts, adjusts the waf build system, and of course doesn't add anything back needed by the old build system. It would be better if this used directly by importing them as modules, instead of calling them via "python". But for now this is simpler.
Diffstat (limited to 'wscript')
1 files changed, 3 insertions, 1 deletions
diff --git a/wscript b/wscript
index f47f965265..94db7e296f 100644
--- a/wscript
+++ b/wscript
@@ -81,6 +81,7 @@ build_options = [
}, {
'name': '--zsh-comp',
'desc': 'zsh completion',
+ 'func': check_ctx_vars('BIN_PERL'),
'func': check_true,
'default': 'disable',
}, {
@@ -995,11 +996,12 @@ def configure(ctx):
ctx.find_program(cc, var='CC')
ctx.find_program(pkg_config, var='PKG_CONFIG')
ctx.find_program(ar, var='AR')
- ctx.find_program('perl', var='BIN_PERL')
+ ctx.find_program('python', var='BIN_PYTHON')
ctx.find_program('rst2html', var='RST2HTML', mandatory=False)
ctx.find_program('rst2man', var='RST2MAN', mandatory=False)
ctx.find_program('rst2pdf', var='RST2PDF', mandatory=False)
ctx.find_program(windres, var='WINDRES', mandatory=False)
+ ctx.find_program('perl', var='BIN_PERL', mandatory=False)