From c15e919a09b5af5d27f172ba127b94d58f2ee234 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 10 Oct 2010 04:25:50 +0200
Subject: wafsamba: Clarify needs_python argument name, use pyembed/pyext where
 applicable.

Allow using both pyembed and pyext, to prevent unresolved symbols.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 10 03:54:01 UTC 2010 on sn-devel-104
---
 buildtools/wafsamba/samba_python.py |  6 +++---
 buildtools/wafsamba/wafsamba.py     | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'buildtools/wafsamba')

diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index 46e6657ce3..ad09981462 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -27,7 +27,7 @@ def SAMBA_PYTHON(bld, name,
 
     if realname is None:
         # a SAMBA_PYTHON target without a realname is just a
-        # library with needs_python=True
+        # library with pyembed=True
         bld.SAMBA_LIBRARY(name,
                           source=source,
                           deps=deps,
@@ -36,7 +36,7 @@ def SAMBA_PYTHON(bld, name,
                           cflags=cflags,
                           local_include=local_include,
                           vars=vars,
-                          needs_python=True,
+                          pyembed=True,
                           enabled=enabled)
         return
 
@@ -52,7 +52,7 @@ def SAMBA_PYTHON(bld, name,
                       local_include=local_include,
                       vars=vars,
                       link_name=link_name,
-                      needs_python=True,
+                      pyembed=True,
                       target_type='PYTHON',
                       install_path='${PYTHONDIR}',
                       enabled=enabled)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 262d3bdc98..9c2c7be3b3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -106,7 +106,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                   vars=None,
                   install_path=None,
                   install=True,
-                  needs_python=False,
+                  pyembed=False,
                   target_type='LIBRARY',
                   bundled_extension=True,
                   link_name=None,
@@ -148,7 +148,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                         group          = group,
                         autoproto      = autoproto,
                         depends_on     = depends_on,
-                        needs_python   = needs_python,
+                        pyembed        = pyembed,
                         hide_symbols   = hide_symbols,
                         local_include  = local_include)
 
@@ -174,7 +174,7 @@ def SAMBA_LIBRARY(bld, libname, source,
     features = 'cc cshlib symlink_lib install_lib'
     if target_type == 'PYTHON':
         features += ' pyext'
-    elif needs_python:
+    if pyembed:
         features += ' pyembed'
     if abi_file:
         features += ' abi_check'
@@ -236,7 +236,7 @@ def SAMBA_BINARY(bld, binname, source,
                  manpages=None,
                  local_include=True,
                  subsystem_name=None,
-                 needs_python=False,
+                 pyembed=False,
                  vars=None,
                  install=True,
                  install_path=None,
@@ -251,7 +251,7 @@ def SAMBA_BINARY(bld, binname, source,
         return
 
     features = 'cc cprogram symlink_bin install_bin'
-    if needs_python:
+    if pyembed:
         features += ' pyembed'
 
     obj_target = binname + '.objlist'
@@ -270,7 +270,7 @@ def SAMBA_BINARY(bld, binname, source,
                         group          = group,
                         autoproto      = autoproto,
                         subsystem_name = subsystem_name,
-                        needs_python   = needs_python,
+                        pyembed        = pyembed,
                         local_include  = local_include,
                         use_hostcc     = use_hostcc,
                         use_global_deps= use_global_deps)
@@ -403,7 +403,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
                     use_global_deps=True,
                     vars=None,
                     hide_symbols=False,
-                    needs_python=False):
+                    pyembed=False):
     '''define a Samba subsystem'''
 
     if not enabled:
@@ -426,8 +426,8 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
     bld.SET_BUILD_GROUP(group)
 
     features = 'cc'
-    if needs_python:
-        features += ' pyext'
+    if pyembed:
+        features += ' pyembed'
 
     t = bld(
         features       = features,
-- 
cgit