buildtools: Use 'pyfeature' instead of pyembed and pyext arguments

This will allow defining other Python-related features, which will be
passed through the stack the same way as the existing two.

Signed-off-by: Petr Viktorin <pviktori@redhat.com>

7 files changed, 9 insertions, 9 deletions

diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index b8ba6384e4..8d5ea591bf 100644
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('samba-policy',
 	pc_files='samba-policy.pc',
 	public_deps='ldb samba-net',
 	vnum='0.0.1',
-	pyembed=True,
+	pyfeature='pyembed',
 	public_headers='policy.h'
 	)
 
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 9b96437883..d5d9b06704 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -143,7 +143,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 bld.SAMBA_SUBSYSTEM('pyrpc_util',
 	source='rpc/pyrpc_util.c',
 	public_deps='pytalloc-util pyparam_util dcerpc MESSAGING',
-	pyext=True,
+	pyfeature='pyext',
 	)
 
 
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 4585a83199..87f2eeef99 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('PROVISION',
 	source='provision.c pyparam.c',
 	deps='LIBPYTHON pyparam_util ldb pytalloc-util pyldb-util',
-	pyext=True,
+	pyfeature='pyext',
 	)
 
 
@@ -50,7 +50,7 @@ bld.SAMBA_SUBSYSTEM('param_options',
 bld.SAMBA_SUBSYSTEM('pyparam_util',
 	source='pyparam_util.c',
 	deps='LIBPYTHON samba-hostconfig',
-	pyext=True,
+	pyfeature='pyext',
 	)
 
 bld.SAMBA_LIBRARY('shares',
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 12d4e8b59a..42e442c771 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -22,7 +22,7 @@ bld.SAMBA_BINARY('samba',
 	subsystem_name='service',
 	deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA
                 popt gensec registry ntptr ntvfs share cluster COMMON_SCHANNEL SECRETS''',
-	pyembed=True,
+	pyfeature='pyembed',
 	install_path='${SBINDIR}',
 	enabled=bld.AD_DC_BUILD_IS_ENABLED()
 	)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index bbb9e9a821..7f746cae4c 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -172,7 +172,7 @@ bld.SAMBA_BINARY('smbtorture',
                  manpages='man/smbtorture.1',
                  public_headers='smbtorture.h',
                  deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
-                 pyembed=True
+                 pyfeature='pyembed',
                  )
 
 bld.SAMBA_BINARY('gentest',
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 046e2372fd..cd12da3d5a 100644
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_BINARY('ntlm_auth4',
                  deps='''samba-hostconfig samba-util popt
                  POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE
                  auth4 NTLMSSP_COMMON MESSAGING events service''',
-                 pyembed=True,
+                 pyfeature='pyembed',
                  install=False
 	)
 
diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index b845067d99..1c447855c7 100644
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -3,7 +3,7 @@
 
 bld.SAMBA_SUBSYSTEM('WEB_WSGI',
 		source='wsgi.c',
-		pyext=True,
+		pyfeature='pyext',
 		deps='talloc LIBTSOCKET',
 		enabled=bld.AD_DC_BUILD_IS_ENABLED()
 		)
@@ -14,7 +14,7 @@ bld.SAMBA_MODULE('service_web',
 		subsystem='service',
 		init_function='server_service_web_init',
 		deps='LIBTLS process_model LIBPYTHON WEB_WSGI',
-		pyembed=True,
+		pyfeature='pyembed',
 		internal_module=False,
 		enabled=bld.AD_DC_BUILD_IS_ENABLED()
 		)