diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-26 15:15:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:58 -0500 |
| commit | e337caeed1459f876449611ae1684616d0ea8f55 (patch) | |
| tree | 172bc1ed142701b20975771e3d788a0fb9aea034 /source4/lib/replace/SConscript | |
| parent | 98a7da234869576c0b4b41ede9fd64a022c3ec58 (diff) | |
| download | samba-e337caeed1459f876449611ae1684616d0ea8f55.tar.gz samba-e337caeed1459f876449611ae1684616d0ea8f55.tar.bz2 samba-e337caeed1459f876449611ae1684616d0ea8f55.zip | |
r10509: Some more sconscript fixes. Now getting to link stage for smbclient
(This used to be commit 6df956edbab7ad5e72b2f20e74ab0f0d62528932)
Diffstat (limited to 'source4/lib/replace/SConscript')
| -rw-r--r-- | source4/lib/replace/SConscript | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/lib/replace/SConscript b/source4/lib/replace/SConscript index 48abf2c081..47bfa481f2 100644 --- a/source4/lib/replace/SConscript +++ b/source4/lib/replace/SConscript @@ -1,6 +1,8 @@ #!/usr/bin/env python Import('hostenv defines') +rep_files = ['replace.c', 'snprintf.c','dlfcn.c'] + if hostenv['configure']: conf = Configure(hostenv) for f in ['memset','syslog','setnetgrent','getnetgrent','endnetgrent', \ @@ -33,7 +35,7 @@ int main() { if conf.CheckCHeader('dlfcn.h'): defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1 - if not conf.CheckType('socklen_t'): + if not conf.CheckType('socklen_t', "#include <sys/socket.h>"): defines['socklen_t'] = 'int' needed_types = { @@ -59,7 +61,10 @@ int main() { if not conf.CheckType(t,type_headers): defines[t] = needed_types[t] + if not conf.TryRun(open("../../build/tests/os2_delete.c").read(), '.c'): + rep_files += ['repdir/repdir.c'] + conf.Finish() -hostenv.StaticLibrary('repdir', ['repdir/repdir.c']) -hostenv.StaticLibrary('replace', ['replace.c', 'snprintf.c','dlfcn.c']) +hostenv.StaticLibrary('replace', rep_files) +SConscript(dirs=['win32']) |