From 356b825838cd97cc43aaa4b108267d1bd5f16ca1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 6 May 2013 13:19:24 +0200 Subject: 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 Reviewed-by: Kai Blin --- source3/wscript_configure_system_ncurses | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source3/wscript_configure_system_ncurses') 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", -- cgit