diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-10-14 14:02:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:44:43 -0500 |
| commit | cffd522b5c806508dfacfb10234e4c0a115c0a98 (patch) | |
| tree | ec5271d813d2cb547757732815a434ba27a89582 /source4/lib | |
| parent | d1e6c228692ff8b06d6eecd6be22fe0727e170ac (diff) | |
| download | samba-cffd522b5c806508dfacfb10234e4c0a115c0a98.tar.gz samba-cffd522b5c806508dfacfb10234e4c0a115c0a98.tar.bz2 samba-cffd522b5c806508dfacfb10234e4c0a115c0a98.zip | |
r11052: bring samba4 uptodate with the samba4-winsrepl branch,
before the bad merge
metze
(This used to be commit 471c0ca4abb17fb5f73c0efed195c67628c1c06e)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/charset/SConscript | 1 | ||||
| -rw-r--r-- | source4/lib/popt/SConscript | 1 | ||||
| -rw-r--r-- | source4/lib/replace/SConscript | 1 | ||||
| -rw-r--r-- | source4/lib/socket/SConscript | 1 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/SConscript | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript index 15ee49909c..9bc474ff48 100644 --- a/source4/lib/charset/SConscript +++ b/source4/lib/charset/SConscript @@ -1,6 +1,7 @@ #!/usr/bin/env python # tastes like -*- python -*- +Import('hostenv') def _CheckIconvPath(context,path): # Some systems have iconv in libc, some have it in libiconv (OSF/1 and diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript index 64faff772c..d9a576a031 100644 --- a/source4/lib/popt/SConscript +++ b/source4/lib/popt/SConscript @@ -1,4 +1,3 @@ -Import('hostenv') # tastes like -*- python -*- Import('hostenv') diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript index 948c33bdc0..cf28102175 100644 --- a/source4/lib/replace/SConscript +++ b/source4/lib/replace/SConscript @@ -1,6 +1,5 @@ #!/usr/bin/env python Import('hostenv defines') -conf = Configure(hostenv) rep_files = ['replace.c', 'snprintf.c','dlfcn.c'] diff --git a/source4/lib/socket/SConscript b/source4/lib/socket/SConscript index 14080fa1b0..73c7eeeeac 100644 --- a/source4/lib/socket/SConscript +++ b/source4/lib/socket/SConscript @@ -1,5 +1,6 @@ #!/usr/bin/env python Import('hostenv defines') + if hostenv['configure']: conf = hostenv.Configure() for h in ['sys/socket.h','sys/sockio.h','sys/un.h']: diff --git a/source4/lib/socket_wrapper/SConscript b/source4/lib/socket_wrapper/SConscript index ab08e3af73..248922bcd7 100644 --- a/source4/lib/socket_wrapper/SConscript +++ b/source4/lib/socket_wrapper/SConscript @@ -1,4 +1,5 @@ Import('hostenv') + opts = Options(None, ARGUMENTS) opts.AddOptions( BoolOption('socket_wrapper','enable socket wrapper',0) |