diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-27 21:28:59 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:11 +1000 |
| commit | 1ee19592f01ac63f3374160abe56fd60bbf75413 (patch) | |
| tree | 93d29e9d55974717bddd8bf02933250975101841 | |
| parent | 91d604add3691e05c0ac1e96d3e2ab223e0b28d5 (diff) | |
| download | samba-1ee19592f01ac63f3374160abe56fd60bbf75413.tar.gz samba-1ee19592f01ac63f3374160abe56fd60bbf75413.tar.bz2 samba-1ee19592f01ac63f3374160abe56fd60bbf75413.zip | |
s4-waf: move the gnu dirs check to the generic wafsamba code
| -rw-r--r-- | buildtools/wafsamba/wscript | 2 | ||||
| -rw-r--r-- | source4/dynconfig/wscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 375c119070..f657b6d96a 100644 --- 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 46a3040f80..b676069d9b 100644 --- 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) |