build: simplify ncurses checks: --with-regedit does not take a path list
authorMichael Adam <obnox@samba.org>
Mon, 6 May 2013 11:19:24 +0000 (13:19 +0200)
committerKai Blin <kai@samba.org>
Mon, 6 May 2013 16:24:58 +0000 (18:24 +0200)
--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>
source3/wscript_configure_system_ncurses

index e8c4ab5cb794f814679dc4badde8c278fcb5d964..e7596be64e3b72141173ebe361bdee2f8e577adf 100644 (file)
@@ -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",