s4-waf: move the gnu dirs check to the generic wafsamba code

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 375c119070f8343b53512035e86b151116115bd3..f657b6d96a66e875995a8288c2ec2a8f09612479 100644 (file)
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -6,6 +6,7 @@ import Options, os, preproc
 def set_options(opt):
     opt.tool_options('compiler_cc')
 
+    opt.tool_options('gnu_dirs')
     opt.add_option('--libdir',
                    help=("object code libraries [PREFIX/lib"),
                    action="store", dest='LIBDIR', default='${PREFIX}/lib')
@@ -54,6 +55,7 @@ def configure(conf):
     conf.SETUP_CONFIGURE_CACHE(Options.options.enable_configure_cache)
 
     # load our local waf extensions
+    conf.check_tool('gnu_dirs')
     conf.check_tool('wafsamba')
 
     conf.CHECK_CC_ENV()

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 46a3040f80ff0550e850ad42b54d01533d3d9c5a..b676069d9b6208875ec23cadbe4d00aa56e9a66a 100644 (file)
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -44,7 +44,6 @@ def get_varname(v):
 
 def set_options(opt):
     # get all the basic GNU options from the gnu_dirs tool
-    opt.tool_options('gnu_dirs')
     for option in dir_options.keys():
         default = dir_options[option][0]
         help    = dir_options[option][1]
@@ -55,7 +54,6 @@ def set_options(opt):
 
 def configure(conf):
     # get all the basic GNU options from the gnu_dirs tool
-    conf.check_tool('gnu_dirs')
     for option in dir_options.keys():
         varname = get_varname(option)
         value = getattr(Options.options, varname, None)