wscript: Add check for --wrap linker flag

[vlendec/samba-autobuild/.git] / source3 / wscript_configure_system_ncurses

diff --git a/source3/wscript_configure_system_ncurses b/source3/wscript_configure_system_ncurses
index e8c4ab5cb794f814679dc4badde8c278fcb5d964..0cc54fb1525e57d9fc9bbc2e9f2e98d00227b460 100644 (file)
--- a/source3/wscript_configure_system_ncurses
+++ b/source3/wscript_configure_system_ncurses
@@ -2,19 +2,13 @@ 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",
+    conf.CHECK_CFG(path=conf.env.NCURSES_CONFIG, args="--cflags --libs",
                package="", uselib_store="NCURSES")
-    conf.env.build_regedit = True
 
 conf.CHECK_HEADERS('ncurses.h menu.h panel.h form.h', lib='ncurses')
 
@@ -22,3 +16,11 @@ conf.CHECK_FUNCS_IN('initscr', 'ncurses')
 conf.CHECK_FUNCS_IN('set_menu_items item_count', 'menu')
 conf.CHECK_FUNCS_IN('new_panel show_panel', 'panel')
 conf.CHECK_FUNCS_IN('new_field new_form', 'form')
+
+if conf.CONFIG_SET('HAVE_NCURSES_H') and \
+   conf.CONFIG_SET('HAVE_MENU_H') and \
+   conf.CONFIG_SET('HAVE_PANEL_H') and \
+   conf.CONFIG_SET('HAVE_FORM_H'):
+    conf.DEFINE('HAVE_NCURSES', '1')
+else:
+    conf.undefine('HAVE_NCURSES')