diff options
| author | Michael Adam <obnox@samba.org> | 2013-05-06 13:19:24 +0200 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2013-05-06 18:24:58 +0200 |
| commit | 356b825838cd97cc43aaa4b108267d1bd5f16ca1 (patch) | |
| tree | b1ee5428b5ba0b19fea9fe9eca3461bbe643e780 | |
| parent | 8d34f2fe1e219a0be28bc6b8ce9f93620d39a5b2 (diff) | |
| download | samba-356b825838cd97cc43aaa4b108267d1bd5f16ca1.tar.gz samba-356b825838cd97cc43aaa4b108267d1bd5f16ca1.tar.bz2 samba-356b825838cd97cc43aaa4b108267d1bd5f16ca1.zip | |
build: simplify ncurses checks: --with-regedit does not take a path list
--with-regedit is defined using SAMBA3_ADD_OPTION(), and can hence
take the values "yes", "no", and "auto". So it is not possible to
hand in paths to look for ncurses-config via this option.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
| -rw-r--r-- | source3/wscript_configure_system_ncurses | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/wscript_configure_system_ncurses b/source3/wscript_configure_system_ncurses index e8c4ab5cb7..e7596be64e 100644 --- a/source3/wscript_configure_system_ncurses +++ b/source3/wscript_configure_system_ncurses @@ -2,14 +2,9 @@ import Logs, Options, sys Logs.info("Looking for ncurses features") -if isinstance(Options.options.with_regedit, list): - path_ncurses_config = [x+'/bin' for x in Options.options.with_regedit] -else: - path_ncurses_config = None - -conf.find_program('ncurses5-config', path_list=path_ncurses_config, var='NCURSES_CONFIG') +conf.find_program('ncurses5-config', var='NCURSES_CONFIG') if not conf.env.NCURSES_CONFIG: - conf.find_program('ncurses6-config', path_list=path_ncurses_config, var='NCURSES_CONFIG') + conf.find_program('ncurses6-config', var='NCURSES_CONFIG') if conf.env.NCURSES_CONFIG: conf.check_cfg(path=conf.env.NCURSES_CONFIG, args="--cflags --libs", |