summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2010-04-23 08:59:43 +0200
committerKai Blin <kai@samba.org>2010-05-20 22:16:14 +0200
commit4acb54c6a0a59ba03eeaa8807d114f8ec3743a9e (patch)
tree542a231217e15d51ff0787b4eaa70722c8183f22
parent9496bdc04f942be117816746e9838c0e57fa759b (diff)
downloadsamba-4acb54c6a0a59ba03eeaa8807d114f8ec3743a9e.tar.gz
samba-4acb54c6a0a59ba03eeaa8807d114f8ec3743a9e.tar.bz2
samba-4acb54c6a0a59ba03eeaa8807d114f8ec3743a9e.zip
s3-waf: Fix global includes to fix waf configure --help output
-rw-r--r--source3/wscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript
index 3779463100..5bbf377fd9 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -8,8 +8,8 @@ from optparse import SUPPRESS_HELP
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, Options
import build.charset
-from samba_utils import *
-from samba3 import *
+import samba_utils
+import samba3
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
@@ -46,6 +46,8 @@ def set_options(opt):
def configure(conf):
+ from samba_utils import TO_LIST
+
conf.define('PACKAGE_NAME', 'Samba')
conf.define('PACKAGE_STRING', 'Samba 3')
conf.define('PACKAGE_TARNAME', 'samba')