From: Ralph Boehme <slow@samba.org>
Date: Fri, 29 Mar 2019 17:40:51 +0000 (+0100)
Subject: s3:wscript: fix flex and bison detection
X-Git-Tag: tdb-1.4.1~315
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f87661c568e33ab4f74e3434ffbb7ec49f03203;p=thirdparty%2Fsamba.git

s3:wscript: fix flex and bison detection

conf.env['BISON'] and conf.env['FLEX'] return lists.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
---

diff --git a/source3/wscript b/source3/wscript
index 6f50f5bc552..4eb0fe878cc 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1653,7 +1653,7 @@ main() {
     Logs.info("Checking for bison")
     bison.configure(conf)
     if conf.env['BISON']:
-        conf.CHECK_COMMAND('%s --version  | head -n1' % conf.env.BISON,
+        conf.CHECK_COMMAND('%s --version  | head -n1' % conf.env.BISON[0],
                            msg='Using bison version',
                            define=None,
                            on_target=False)
@@ -1662,7 +1662,7 @@ main() {
     conf.find_program('flex', var='FLEX')
     if conf.env['FLEX']:
         conf.env.FLEXFLAGS = ['-t']
-        conf.CHECK_COMMAND('%s --version' % conf.env.FLEX,
+        conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0],
                            msg='Using flex version',
                            define=None,
                            on_target=False)