From 942c0d2128cb8e64a9354dde6bdae82a1c1c3d88 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 26 Mar 2021 21:48:45 +1300 Subject: build: Notice if flex is missing at configure time This may also fix the coverage build by ensuring --noline is always specified to flex. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14586 Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Mar 29 02:12:23 UTC 2021 on sn-devel-184 --- wscript | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index e44436391a8..9c501e9441f 100644 --- a/wscript +++ b/wscript @@ -232,6 +232,19 @@ def configure(conf): if not (Options.options.without_ad_dc): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + # Check for flex before doing the embedded heimdal checks so we can bail if we don't have it. + Logs.info("Checking for flex") + conf.find_program('flex', var='FLEX') + if conf.env['FLEX']: + conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0], + msg='Using flex version', + define=None, + on_target=False) + conf.env.FLEXFLAGS = ['-t'] + + # #line statements in these generated files cause issues for lcov + conf.env.FLEXFLAGS += ["--noline"] + if Options.options.with_system_mitkrb5: if not Options.options.with_experimental_mit_ad_dc and \ not Options.options.without_ad_dc: @@ -355,9 +368,6 @@ def configure(conf): msg="Checking compiler for full RELRO support"): conf.env['ENABLE_RELRO'] = True - # #line statements in these generated files cause issues for lcov - conf.env.FLEXFLAGS += ["--noline"] - conf.SAMBA_CONFIG_H('include/config.h') def etags(ctx): -- cgit v1.2.1