From 8a878ec74bd24180aa73cfb39ff4a6c3e72d9d0b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 7 May 2013 14:15:35 +0200 Subject: talloc: only provide the --enable-talloc-compat1 in standalone build The compat library is already only built in standalone build, so we need the configure option also only in the standalone build. Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- lib/talloc/wscript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/talloc') diff --git a/lib/talloc/wscript b/lib/talloc/wscript index bd7708e47d..ecc5e24d47 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -27,10 +27,10 @@ def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc') opt.RECURSE('lib/replace') - opt.add_option('--enable-talloc-compat1', - help=("Build talloc 1.x.x compat library [False]"), - action="store_true", dest='TALLOC_COMPAT1', default=False) if opt.IN_LAUNCH_DIR(): + opt.add_option('--enable-talloc-compat1', + help=("Build talloc 1.x.x compat library [False]"), + action="store_true", dest='TALLOC_COMPAT1', default=False) opt.add_option('--disable-python', help=("disable the pytalloc module"), action="store_true", dest='disable_python', default=False) @@ -51,7 +51,9 @@ def configure(conf): implied_deps='talloc replace'): conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 + conf.env.TALLOC_COMPAT1 = False + if conf.env.standalone_talloc: + conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 conf.CHECK_XSLTPROC_MANPAGES() -- cgit