sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

build: fix --with-regedit to properly honour the yes/no/auto scheme

Browse Source 
I.e. fail configure when ncurses support is not found but
regedit build was requested.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
This commit is contained in:
Michael Adam 2013-05-06 14:14:02 +02:00 committed by Kai Blin
parent 356b825838
commit 431eeef931
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/wscript
View File

@ -1713,8 +1713,23 @@ main() {
if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'): if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'):
conf.DEFINE('HAVE_CEPH', '1') conf.DEFINE('HAVE_CEPH', '1')
if Options.options.with_regedit: conf.env.build_regedit = False
if not Options.options.with_regedit == False:
conf.PROCESS_SEPARATE_RULE('system_ncurses') conf.PROCESS_SEPARATE_RULE('system_ncurses')
if conf.CONFIG_SET('HAVE_NCURSES'):
conf.env.build_regedit = True
if conf.env.build_regedit:
Logs.info("building regedit")
else:
if Options.options.with_regedit == False:
Logs.info("not building regedit (--without-regedit)")
elif Options.options.with_regedit == True:
Logs.error("ncurses not available, cannot build regedit")
conf.fatal("ncurses not available, but --with-regedit was specified")
else:
Logs.info("ncurses not available, not building regedit")
default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
auth_sam auth_unix auth_winbind auth_wbc auth_sam auth_unix auth_winbind auth_wbc

9
source3/wscript_configure_system_ncurses
View File

@ -9,7 +9,6 @@ if not conf.env.NCURSES_CONFIG:
if conf.env.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") package="", uselib_store="NCURSES")
conf.env.build_regedit = True
conf.CHECK_HEADERS('ncurses.h menu.h panel.h form.h', lib='ncurses') conf.CHECK_HEADERS('ncurses.h menu.h panel.h form.h', lib='ncurses')
@ -17,3 +16,11 @@ conf.CHECK_FUNCS_IN('initscr', 'ncurses')
conf.CHECK_FUNCS_IN('set_menu_items item_count', 'menu') conf.CHECK_FUNCS_IN('set_menu_items item_count', 'menu')
conf.CHECK_FUNCS_IN('new_panel show_panel', 'panel') conf.CHECK_FUNCS_IN('new_panel show_panel', 'panel')
conf.CHECK_FUNCS_IN('new_field new_form', 'form') 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')