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/SConstruct | |
| 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/SConstruct')
| -rw-r--r-- | source4/SConstruct | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source4/SConstruct b/source4/SConstruct index 10b7c5f64f..6e38428b56 100644 --- a/source4/SConstruct +++ b/source4/SConstruct @@ -67,6 +67,8 @@ defines = loadconfig() if defines == None: hostenv['configure'] = 1 + +if hostenv['configure']: defines = {} Export('defines') @@ -191,13 +193,22 @@ return 0; """, '.c'): defines['TIME_WITH_SYS_TIME'] = 1 - if conf.TryCompile(""" + if conf.TryCompile(""" #include <sys/time.h> #include <unistd.h> main() { struct timeval tv; exit(gettimeofday(&tv, NULL));} """, '.c'): defines['HAVE_GETTIMEOFDAY_TZ'] = 1 + # Check for header that defines "DIR" + for h in ['dirent.h','sys/ndir.h','sys/dir.h','ndir.h']: + if conf.TryCompile(""" +#include <%s> + +int main() { DIR *x; return 0; }""" % h, '.c'): + defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1 + break + conf.Finish() [dynenv.Append(CPPDEFINES = {p: '\\"%s\\"' % paths[p]}) for p in paths] |