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 <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 8a878ec74bd24180aa73cfb39ff4a6c3e72d9d0b)

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index bd7708e47d06ab6542d2f6f0961b1ed2194af60c..ecc5e24d4755f2dd08e202d998f4eff403821b91 100644 (file)
--- 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()