diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-10-14 12:54:52 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:42:33 -0500 |
commit | 2ecb46d595b880c533e2dafea43baf02f009bec6 (patch) | |
tree | 4b662f0cd14a19c4fb85b478a4decd6dbab8612c /source4/lib | |
parent | 2f54bab9514bf9af898a12173d0871684c94fa2e (diff) | |
download | samba-2ecb46d595b880c533e2dafea43baf02f009bec6.tar.gz samba-2ecb46d595b880c533e2dafea43baf02f009bec6.tar.bz2 samba-2ecb46d595b880c533e2dafea43baf02f009bec6.zip |
r11037:
(This used to be commit 6913e338405a5aca5c70cf6e022532c596ed0a36)
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, 2 insertions, 3 deletions
diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript index 9bc474ff48..15ee49909c 100644 --- a/source4/lib/charset/SConscript +++ b/source4/lib/charset/SConscript @@ -1,7 +1,6 @@ #!/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 d9a576a031..64faff772c 100644 --- a/source4/lib/popt/SConscript +++ b/source4/lib/popt/SConscript @@ -1,3 +1,4 @@ +Import('hostenv') # tastes like -*- python -*- Import('hostenv') diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript index cf28102175..948c33bdc0 100644 --- a/source4/lib/replace/SConscript +++ b/source4/lib/replace/SConscript @@ -1,5 +1,6 @@ #!/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 73c7eeeeac..14080fa1b0 100644 --- a/source4/lib/socket/SConscript +++ b/source4/lib/socket/SConscript @@ -1,6 +1,5 @@ #!/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 248922bcd7..ab08e3af73 100644 --- a/source4/lib/socket_wrapper/SConscript +++ b/source4/lib/socket_wrapper/SConscript @@ -1,5 +1,4 @@ Import('hostenv') - opts = Options(None, ARGUMENTS) opts.AddOptions( BoolOption('socket_wrapper','enable socket wrapper',0) |