wafsamba: Fix handling of pyembed/pyext.

7 files changed, 39 insertions, 41 deletions

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 414fdc61fc..e53472b76a 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -148,8 +148,8 @@ def SAMBA_LIBRARY(bld, libname, source,
                         group          = group,
                         autoproto      = autoproto,
                         depends_on     = depends_on,
-                        pyembed        = pyembed,
                         hide_symbols   = hide_symbols,
+                        pyext          = (target_type == "PYTHON"),
                         local_include  = local_include)
 
     if BUILTIN_LIBRARY(bld, libname):
@@ -270,9 +270,9 @@ def SAMBA_BINARY(bld, binname, source,
                         group          = group,
                         autoproto      = autoproto,
                         subsystem_name = subsystem_name,
-                        pyembed        = pyembed,
                         local_include  = local_include,
                         use_hostcc     = use_hostcc,
+                        pyext          = pyembed,
                         use_global_deps= use_global_deps)
 
     bld.SET_BUILD_GROUP(group)
@@ -409,7 +409,6 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
                     use_global_deps=True,
                     vars=None,
                     hide_symbols=False,
-                    pyembed=False,
                     pyext=False):
     '''define a Samba subsystem'''
 
@@ -433,8 +432,6 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
     bld.SET_BUILD_GROUP(group)
 
     features = 'cc'
-    if pyembed:
-        features += ' pyembed'
     if pyext:
         features += ' pyext'
 
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index fffd8ce85b..67b25b4545 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -107,8 +107,7 @@ def build(bld):
     else:
         abi_file = 'ABI/ldb-%s.sigs' % VERSION
 
-    bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb',
-            source='pyldb_util.c', pyembed=True)
+    bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb', source='pyldb_util.c', pyext=True)
 
     if not bld.CONFIG_SET('USING_SYSTEM_LDB'):
         modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}')
diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index aa7feee845..3daa91e007 100644
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -5,7 +5,8 @@ bld.SAMBA_LIBRARY('policy',
 	pc_files='policy.pc',
 	public_deps='ldb LIBSAMBA-NET',
 	public_headers='policy.h',
-	vnum='0.0.1'
+	vnum='0.0.1',
+	pyembed=True
 	)
 
 bld.SAMBA_PYTHON('py_policy',
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 617387e877..665eb1e10e 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -174,7 +174,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 bld.SAMBA_SUBSYSTEM('pyrpc_util',
 	source='rpc/pyrpc_util.c',
 	public_deps='PYTALLOC pyparam_util pycredentials dcerpc',
-	pyembed=True,
+	pyext=True,
 	)
 
 
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 6532782b85..3595d0be7a 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -14,7 +14,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
 bld.SAMBA_SUBSYSTEM('PROVISION',
 	source='provision.c pyparam.c',
 	deps='LIBPYTHON pyparam_util ldb PYTALLOC',
-	pyembed=True,
+	pyext=True,
 	)
 
 
@@ -57,6 +57,6 @@ bld.SAMBA_PYTHON('param',
 bld.SAMBA_SUBSYSTEM('pyparam_util',
 	source='pyparam_util.c',
 	deps='LIBPYTHON LIBSAMBA-HOSTCONFIG',
-	pyembed=True
+	pyext=True,
 	)
 
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 055edc8f6a..d691d61f73 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -1,34 +1,34 @@
 #!/usr/bin/env python
 
 bld.SAMBA_SUBSYSTEM('LIBPYTHON',
-				source='modules.c',
-				public_deps='EXT_LIB_PYTHON',
-				init_function_sentinal='{NULL,NULL}',
-				pyembed=True,
-				deps='talloc',
-	)
+		source='modules.c',
+		public_deps='EXT_LIB_PYTHON',
+		init_function_sentinal='{NULL,NULL}',
+		deps='talloc',
+		pyext=True,
+		)
 
 
 bld.SAMBA_SUBSYSTEM('PYTALLOC',
-				source='../../../lib/talloc/pytalloc.c',
-				public_deps='EXT_LIB_PYTHON talloc',
-				pyembed=True,
-)
+		source='../../../lib/talloc/pytalloc.c',
+		public_deps='EXT_LIB_PYTHON talloc',
+		pyext=True,
+		)
 
 
 bld.SAMBA_PYTHON('python_uuid',
-                 source='uuidmodule.c',
-                 deps='LIBNDR',
-                 realname='uuid.so',
-                 enabled = float(bld.env.PYTHON_VERSION) <= 2.4
-                 )
+		source='uuidmodule.c',
+		deps='LIBNDR',
+		realname='uuid.so',
+		enabled = float(bld.env.PYTHON_VERSION) <= 2.4
+		)
 
 
 bld.SAMBA_PYTHON('python_glue',
-                 source='pyglue.c',
-                 deps='pyparam_util LIBSAMBA-UTIL LIBNETIF PYTALLOC',
-                 realname='samba/_glue.so'
-	)
+		source='pyglue.c',
+		deps='pyparam_util LIBSAMBA-UTIL LIBNETIF PYTALLOC',
+		realname='samba/_glue.so'
+		)
 
 
 # create a dummy subsystem for EXT_LIB_PYTHON
diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index dc1c3870dc..eb0f44f4da 100644
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -2,17 +2,18 @@
 
 
 bld.SAMBA_SUBSYSTEM('WEB_WSGI',
-				source='wsgi.c',
-				deps='talloc LIBTSOCKET',
-				pyembed=True
-                 )
+		source='wsgi.c',
+		pyext=True,
+		deps='talloc LIBTSOCKET',
+		)
 
 
 bld.SAMBA_MODULE('WEB',
-                 source='web_server.c',
-                 autoproto='proto.h',
-                 autoproto_extra_source='wsgi.c',
-                 subsystem='service',
-                 init_function='server_service_web_init',
-                 deps='LIBTLS smbcalls process_model LIBPYTHON WEB_WSGI'
-                 )
+		source='web_server.c',
+		autoproto='proto.h',
+		autoproto_extra_source='wsgi.c',
+		subsystem='service',
+		init_function='server_service_web_init',
+		deps='LIBTLS smbcalls process_model LIBPYTHON WEB_WSGI',
+		pyembed=True,
+		)