1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00

regedit: First crack at linking to ncurses.

First attempt of editing build scripts to link to ncurses
libraries. It seems to work, though checks may need to be
expanded upon.

Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
C. Davis 2012-07-10 06:16:35 -07:00 committed by Michael Adam
parent 6c881e285b
commit dc0029c946
3 changed files with 18 additions and 1 deletions

View File

@ -22,6 +22,8 @@
#include "lib/util/data_blob.h"
#include "lib/registry/registry.h"
#include "regedit.h"
#include <ncurses.h>
#include <menu.h>
int main(int argc, char **argv)
{
@ -43,6 +45,9 @@ int main(int argc, char **argv)
uint32_t n;
WERROR rv;
initscr();
endwin();
frame = talloc_stackframe();
setup_logging("regedit", DEBUG_DEFAULT_STDERR);

View File

@ -47,6 +47,8 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('cluster-support', default=None)
opt.SAMBA3_ADD_OPTION('regedit', default=True)
opt.add_option('--with-ctdb-dir',
help=("Directory under which ctdb is installed"),
action="store", dest='ctdb_dir', default=None)
@ -1711,6 +1713,14 @@ main() {
if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'):
conf.DEFINE('HAVE_CEPH', '1')
if Options.options.with_regedit:
#XXX these checks might need to be expanded
ncurses = conf.CHECK_FUNCS_IN('initscr', 'ncurses', headers='ncurses.h')
menu = conf.CHECK_FUNCS_IN('set_menu_items item_count', 'menu',
headers='menu.h')
if ncurses and menu:
conf.env.build_regedit = True
default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
auth_sam auth_unix auth_winbind auth_wbc
auth_domain auth_builtin vfs_default

View File

@ -1643,7 +1643,9 @@ bld.SAMBA3_PYTHON('pylibsmb',
bld.SAMBA3_BINARY('regedit',
source='utils/regedit.c utils/regedit_samba3.c utils/regedit_wrap.c',
deps='registry param popt_samba3 smbregistry')
deps='ncurses menu registry param popt_samba3 smbregistry',
enabled=bld.env.build_regedit,
vars=locals())
swat_dir = os.path.join(bld.curdir, '../swat')
swat_files = recursive_dirlist(swat_dir, swat_dir, '*')