s3/rpc_server/mdssvc: Generate flex/bison files in build

[samba.git] / source3 / wscript

diff --git a/source3/wscript b/source3/wscript
index 9784993f536a83c6d3345aaa4497f0c01cd157a4..01d52740dafac001d5cc6fb7a77b0a80071a920b 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -10,6 +10,7 @@ import wafsamba, Options, Logs, Utils, Scripting
 import build.charset
 import samba_utils, samba_version
 import samba3
 import build.charset
 import samba_utils, samba_version
 import samba3

+import bison, flex

 
 default_prefix = Options.default_prefix = '/usr/local/samba'
 
 
 default_prefix = Options.default_prefix = '/usr/local/samba'
 


@@ -1644,6 +1645,17 @@ main() {
     conf.env['libtracker']=''
     conf.env.with_spotlight = False
     if Options.options.with_spotlight:
     conf.env['libtracker']=''
     conf.env.with_spotlight = False
     if Options.options.with_spotlight:

+
+        Logs.info("Requested Spotlight support, checking for bison")
+        bison.detect(conf)
+        if not conf.env['BISON']:
+            conf.fatal("Spotlight support requested but bison missing")
+        conf.CHECK_COMMAND('%s --version | head -n1' % conf.env['BISON'], msg='Using bison version', define=None, on_target=False)
+        Logs.info("Requested Spotlight support, checking for flex")
+        flex.detect(conf)
+        if not conf.env['FLEX']:
+            conf.fatal("Spotlight support requested but flex missing")
+        conf.CHECK_COMMAND('%s --version' % conf.env['FLEX'], msg='Using flex version', define=None, on_target=False)

         versions = ['1.0', '0.16', '0.14']
         for version in versions:
             testlib = 'tracker-sparql-' + version
         versions = ['1.0', '0.16', '0.14']
         for version in versions:
             testlib = 'tracker-sparql-' + version


@@ -1662,7 +1674,7 @@ main() {
         default_static_modules.extend(TO_LIST('rpc_mdssvc_module'))
 
     forced_static_modules.extend(TO_LIST('auth_domain auth_builtin auth_sam auth_winbind'))
         default_static_modules.extend(TO_LIST('rpc_mdssvc_module'))
 
     forced_static_modules.extend(TO_LIST('auth_domain auth_builtin auth_sam auth_winbind'))

-    default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
+    default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam

                                       auth_unix
                                       nss_info_template idmap_tdb idmap_passdb
                                       idmap_nss'''))
                                       auth_unix
                                       nss_info_template idmap_tdb idmap_passdb
                                       idmap_nss'''))