diff options
| author | Tim Potter <tpot@samba.org> | 2005-09-26 07:33:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:56 -0500 |
| commit | 230e60c204ffd5f6e82c802d020b7704ec51ce3e (patch) | |
| tree | 9fb8de885c3317e68482297afbc56015c38585ff /source4/SConstruct | |
| parent | 6b73c29bb7d7f948b2605aa36f8f681a06aa825f (diff) | |
| download | samba-230e60c204ffd5f6e82c802d020b7704ec51ce3e.tar.gz samba-230e60c204ffd5f6e82c802d020b7704ec51ce3e.tar.bz2 samba-230e60c204ffd5f6e82c802d020b7704ec51ce3e.zip | |
r10498: Detect some more networking headers.
Hardcode value of RETSIGTYPE for now.
Diddle with order of including SConscript files to make ldb happier.
(This used to be commit 256f8f7a3846c8d069dd972c8623113d02a1f474)
Diffstat (limited to 'source4/SConstruct')
| -rw-r--r-- | source4/SConstruct | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source4/SConstruct b/source4/SConstruct index e0378ee534..10b7c5f64f 100644 --- a/source4/SConstruct +++ b/source4/SConstruct @@ -123,7 +123,7 @@ if hostenv['configure']: ['sys/syslog.h','syslog.h','stdint.h','inttypes.h','locale.h'] + \ ['shadow.h','nss.h','nss_common.h','ns_api.h','sys/security.h'] + \ ['security/pam_appl.h','sys/capability.h'] + \ - ['sys/acl.h','stdbool.h']: + ['sys/acl.h','stdbool.h', 'netinet/in.h', 'sys/socket.h', 'arpa/inet.h', 'netdb.h']: if conf.CheckCHeader(h): defines['HAVE_' + h.upper().replace('.','_').replace('/','_')] = 1 @@ -137,6 +137,9 @@ if hostenv['configure']: # Pull in GNU extensions defines['_GNU_SOURCE'] = 1 + # Hardcode signal return type for now + defines['RETSIGTYPE'] = 'void' + if conf.CheckType('comparison_fn_t', '#define _GNU_SOURCE\n#include <stdlib.h>'): defines['HAVE_COMPARISON_FN_T'] = 1 @@ -188,6 +191,13 @@ return 0; """, '.c'): defines['TIME_WITH_SYS_TIME'] = 1 + if conf.TryCompile(""" +#include <sys/time.h> +#include <unistd.h> +main() { struct timeval tv; exit(gettimeofday(&tv, NULL));} +""", '.c'): + defines['HAVE_GETTIMEOFDAY_TZ'] = 1 + conf.Finish() [dynenv.Append(CPPDEFINES = {p: '\\"%s\\"' % paths[p]}) for p in paths] @@ -198,7 +208,7 @@ Export('dynconfig') hostenv.proto_headers = [] SConscript( - dirs=['lib','torture','rpc_server','cldap_server','libcli', + dirs=['dsdb', 'libcli', 'lib','torture','rpc_server','cldap_server', 'nbt_server','client','ldap_server','libnet','nsswitch','web_server', 'smbd','dsdb','heimdal_build','ntptr','kdc','smb_server','ntvfs', 'winbind','scripting','auth', 'librpc','script/tests']) |