summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC. Davis <cd.rattan@gmail.com>2012-07-10 06:16:35 -0700
committerMichael Adam <obnox@samba.org>2013-04-29 13:05:44 +0200
commitdc0029c9463612d9fce6e19f04cf5d9aeed1b2d6 (patch)
treea4af2727d419d34e3f0856e6d068080bc4d06222
parent6c881e285b4a130bddd15f7d740e4c64a33e0de3 (diff)
downloadsamba-dc0029c9463612d9fce6e19f04cf5d9aeed1b2d6.tar.gz
samba-dc0029c9463612d9fce6e19f04cf5d9aeed1b2d6.tar.bz2
samba-dc0029c9463612d9fce6e19f04cf5d9aeed1b2d6.zip
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>
-rw-r--r--source3/utils/regedit.c5
-rw-r--r--source3/wscript10
-rwxr-xr-xsource3/wscript_build4
3 files changed, 18 insertions, 1 deletions
diff --git a/source3/utils/regedit.c b/source3/utils/regedit.c
index 9c117e346e..5ae21201fb 100644
--- a/source3/utils/regedit.c
+++ b/source3/utils/regedit.c
@@ -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);
diff --git a/source3/wscript b/source3/wscript
index 18e45f2ed6..54daaa7f22 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -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
diff --git a/source3/wscript_build b/source3/wscript_build
index 269b29aec7..61acb377e0 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -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, '*')