sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

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

Browse Source
This commit is contained in:
Andrew Tridgell 2010-03-27 21:28:59 +11:00
parent 91d604add3
commit 1ee19592f0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildtools/wafsamba/wscript
View File

@ -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()

2
source4/dynconfig/wscript
View File

@ -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)