s3:wscript: fix flex and bison detection
authorRalph Boehme <slow@samba.org>
Fri, 29 Mar 2019 17:40:51 +0000 (18:40 +0100)
committerRalph Boehme <slow@samba.org>
Wed, 24 Apr 2019 18:32:14 +0000 (18:32 +0000)
conf.env['BISON'] and conf.env['FLEX'] return lists.

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

index 6f50f5bc552c4d96574ee5536c4e4b04ffdb6d34..4eb0fe878cc1bd9e6cc501584ff4a7de9820fc24 100644 (file)
@@ -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)