[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  942c0d2128c build: Notice if flex is missing at configure time
      from  5bc1463a5c6 build: Consolidate --with-dnsupdate with --with-ads (which implied HAVE_KRB5)

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 942c0d2128cb8e64a9354dde6bdae82a1c1c3d88
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Mar 26 21:48:45 2021 +1300

    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 <abartlet at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon Mar 29 02:12:23 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript                    |  9 ---------
 wscript                            | 16 +++++++++++++---
 wscript_configure_embedded_heimdal |  3 +++
 3 files changed, 16 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 3ee7d0914ed..b7dd5bd737a 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1828,15 +1828,6 @@ main() {
                            define=None,
                            on_target=False)
 
-    Logs.info("Checking for flex")
-    conf.find_program('flex', var='FLEX')
-    if conf.env['FLEX']:
-        conf.env.FLEXFLAGS = ['-t']
-        conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0],
-                           msg='Using flex version',
-                           define=None,
-                           on_target=False)
-
     with_spotlight_tracker_backend = (
         conf.CONFIG_SET('HAVE_TRACKER')
         and conf.CONFIG_SET('HAVE_GLIB')
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):
diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
index 8c55ae2a938..92a29f71bf8 100644
--- a/wscript_configure_embedded_heimdal
+++ b/wscript_configure_embedded_heimdal
@@ -1 +1,4 @@
+if not conf.env['FLEX']:
+    conf.fatal("Embedded Heimdal build requires flex but it was not found.  Install flex or use --with-system-mitkrb5 or --with-system-heimdalkrb5")
+
 conf.RECURSE('source4/heimdal_build')


-- 
Samba Shared Repository