[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Tue Jan 31 18:44:03 MST 2012
The branch, master has been updated
via b7d5d01 s3/wscript: Fix dependency on gssapi, necessary when there is no system Kerberos.
via 51e162d source3/wscript: Expand tabs, to prevent confusion (whitespace is significant in python/waf).
via 5931e1d replace: Add include for bsd/string.h.
from 1f328d1 s3: Add rmdir operation to streams_depot
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b7d5d01c35b875c0458a0c7145f3d67e7f731eba
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 31 22:31:30 2012 +0100
s3/wscript: Fix dependency on gssapi, necessary when there is no system Kerberos.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Wed Feb 1 02:43:11 CET 2012 on sn-devel-104
commit 51e162df8bd364583e3af43066b7ea273d986e97
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 31 22:30:45 2012 +0100
source3/wscript: Expand tabs, to prevent confusion (whitespace is significant in python/waf).
commit 5931e1da87de591a2b4cb61c6c97cc60d4f01175
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jan 31 22:28:08 2012 +0100
replace: Add include for bsd/string.h.
-----------------------------------------------------------------------
Summary of changes:
lib/replace/replace.h | 4 +
source3/wscript | 642 ++++++++++++++++++++++++------------------------
source3/wscript_build | 2 +-
3 files changed, 326 insertions(+), 322 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index c47cf1c..7112414 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -104,6 +104,10 @@
# define PRIu64 __PRI64_PREFIX "u"
#endif
+#ifdef HAVE_BSD_STRING_H
+#include <bsd/string.h>
+#endif
+
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/source3/wscript b/source3/wscript
index 912997f..901d2b6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -157,8 +157,8 @@ main() {
#include <signal.h>
#include <sys/file.h>
#ifndef LOCK_MAND
-#define LOCK_MAND 32
-#define LOCK_READ 64
+#define LOCK_MAND 32
+#define LOCK_READ 64
#endif
main() {
exit(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
@@ -172,7 +172,7 @@ main() {
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blksize', define='HAVE_STAT_ST_BLKSIZE',
headers='sys/stat.h')
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_flags', define='HAVE_STAT_ST_FLAGS',
- headers='sys/types.h sys/stat.h unistd.h')
+ headers='sys/types.h sys/stat.h unistd.h')
# Check for POSIX capability support
conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
@@ -301,8 +301,8 @@ utimensat vsyslog _write __write __xstat
#FIXME: add more checks
if Options.options.with_acl_support:
if host_os.rfind('linux') > -1:
- conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
- conf.CHECK_FUNCS_IN('getxattr', 'attr')
+ conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
+ conf.CHECK_FUNCS_IN('getxattr', 'attr')
if conf.CHECK_CODE('''
acl_t acl;
int entry_id;
@@ -311,7 +311,7 @@ return acl_get_entry(acl, entry_id, entry_p);
''',
'HAVE_POSIX_ACLS',
headers='sys/types.h sys/acl.h', link=False,
- msg="Checking for POSIX ACL support") :
+ msg="Checking for POSIX ACL support") :
conf.CHECK_CODE('''
acl_permset_t permset_d;
acl_perm_t perm;
@@ -338,54 +338,54 @@ return acl_get_perm_np(permset_d, perm);
if conf.CONFIG_SET('HAVE_FALLOCATE'):
conf.CHECK_CODE('''
- int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
- 'HAVE_LINUX_FALLOCATE',
- msg="Checking whether the Linux 'fallocate' function is available",
- headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
+ int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
+ 'HAVE_LINUX_FALLOCATE',
+ msg="Checking whether the Linux 'fallocate' function is available",
+ headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
if conf.CONFIG_SET('HAVE_FALLOCATE64'):
conf.CHECK_CODE('''
- int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
- 'HAVE_LINUX_FALLOCATE64',
- msg="Checking whether the Linux 'fallocate64' function is available",
- headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
+ int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
+ 'HAVE_LINUX_FALLOCATE64',
+ msg="Checking whether the Linux 'fallocate64' function is available",
+ headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
conf.CHECK_CODE('''
- ssize_t err = readahead(0,0,0x80000);''',
- 'HAVE_LINUX_READAHEAD',
- msg="Checking whether Linux readahead is available",
- headers='unistd.h fcntl.h')
+ ssize_t err = readahead(0,0,0x80000);''',
+ 'HAVE_LINUX_READAHEAD',
+ msg="Checking whether Linux readahead is available",
+ headers='unistd.h fcntl.h')
conf.CHECK_DECLS('readahead', headers='fcntl.h', always=True)
conf.CHECK_CODE('''
- struct ucred cred;
- socklen_t cred_len;
- int ret = getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len);''',
- 'HAVE_PEERCRED',
- msg="Checking whether we can use SO_PEERCRED to get socket credentials",
- headers='sys/types.h sys/socket.h')
+ struct ucred cred;
+ socklen_t cred_len;
+ int ret = getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len);''',
+ 'HAVE_PEERCRED',
+ msg="Checking whether we can use SO_PEERCRED to get socket credentials",
+ headers='sys/types.h sys/socket.h')
conf.CHECK_CODE('''
- #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
- #include <sys/types.h>
- #else
- __COMPILE_ERROR_
- #endif
- int i;''',
- 'HAVE_EXPLICIT_LARGEFILE_SUPPORT',
- msg="Checking whether large file support can be enabled")
+ #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
+ #include <sys/types.h>
+ #else
+ __COMPILE_ERROR_
+ #endif
+ int i;''',
+ 'HAVE_EXPLICIT_LARGEFILE_SUPPORT',
+ msg="Checking whether large file support can be enabled")
if Options.options.with_aio_support:
- conf.CHECK_FUNCS_IN('aio_read', 'aio')
- conf.CHECK_FUNCS_IN('aio_read', 'rt')
+ conf.CHECK_FUNCS_IN('aio_read', 'aio')
+ conf.CHECK_FUNCS_IN('aio_read', 'rt')
conf.CHECK_CODE('struct aiocb a; return aio_read(&a);',
- 'HAVE_AIO',
- msg='Checking for asynchronous io support',
- headers='sys/types.h aio.h',
- lib='aio rt')
+ 'HAVE_AIO',
+ msg='Checking for asynchronous io support',
+ headers='sys/types.h aio.h',
+ lib='aio rt')
conf.CHECK_CODE('struct aiocb64 a; return aio_read64(&a);',
- 'HAVE_AIO64',
- msg='Checking for 64-bit asynchronous io support',
- headers='sys/types.h aio.h',
- lib='aio rt')
+ 'HAVE_AIO64',
+ msg='Checking for 64-bit asynchronous io support',
+ headers='sys/types.h aio.h',
+ lib='aio rt')
if conf.CONFIG_SET('HAVE_AIO64'):
conf.DEFINE('HAVE_AIOCB64', '1')
conf.DEFINE('WITH_AIO', '1')
@@ -406,7 +406,7 @@ return acl_get_perm_np(permset_d, perm);
conf.CHECK_CODE('struct aiocb a; return aio_return64(&a);', 'HAVE_AIO_RETURN64', msg='Checking for aio_return64', headers='aio.h', lib='aio rt')
conf.CHECK_CODE('struct aiocb a; return aio_error64(&a);', 'HAVE_AIO_ERROR64', msg='Checking for aio_error64', headers='aio.h', lib='aio rt')
conf.CHECK_CODE('struct aiocb a; return aio_cancel64(1, &a);', 'HAVE_AIO_CANCEL64', msg='Checking for aio_cancel64', headers='aio.h', lib='aio rt')
- conf.CHECK_CODE('struct aiocb a; return aio_suspend64(&a, 1, NULL);', 'HAVE_AIO_SUSPEND64', msg='Checking for aio_suspend64', headers='aio.h', lib='aio rt')
+ conf.CHECK_CODE('struct aiocb a; return aio_suspend64(&a, 1, NULL);', 'HAVE_AIO_SUSPEND64', msg='Checking for aio_suspend64', headers='aio.h', lib='aio rt')
if not conf.CONFIG_SET('HAVE_AIO'):
conf.DEFINE('HAVE_NO_AIO', '1')
else:
@@ -415,24 +415,24 @@ return acl_get_perm_np(permset_d, perm);
conf.CHECK_CODE('''
struct msghdr msg;
union {
- struct cmsghdr cm;
+ struct cmsghdr cm;
char control[CMSG_SPACE(sizeof(int))];
} control_un;
msg.msg_control = control_un.control;
msg.msg_controllen = sizeof(control_un.control);
''',
- 'HAVE_MSGHDR_MSG_CONTROL',
- msg='Checking if we can use msg_control for passing file descriptors',
- headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
+ 'HAVE_MSGHDR_MSG_CONTROL',
+ msg='Checking if we can use msg_control for passing file descriptors',
+ headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
conf.CHECK_CODE('''
struct msghdr msg;
int fd;
msg.msg_acctrights = (caddr_t) &fd;
msg.msg_acctrightslen = sizeof(fd);
''',
- 'HAVE_MSGHDR_MSG_ACCTRIGHTS',
- msg='Checking if we can use msg_acctrights for passing file descriptors',
- headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
+ 'HAVE_MSGHDR_MSG_ACCTRIGHTS',
+ msg='Checking if we can use msg_acctrights for passing file descriptors',
+ headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
if Options.options.with_winbind:
conf.env.build_winbind = True
@@ -487,7 +487,7 @@ msg.msg_acctrightslen = sizeof(fd);
# we would normally use --libs here, but cups-config incorrectly adds
# gssapi_krb5 and other libraries to its --libs output. That breaks the use
# of an in-tree heimdal kerberos
- conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags",
+ conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags",
package="", uselib_store="CUPS")
conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups')
conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', 'cups')
@@ -501,7 +501,7 @@ msg.msg_acctrightslen = sizeof(fd);
conf.SET_TARGET_TYPE('cups', 'EMPTY')
if Options.options.with_iprint:
- if conf.CONFIG_SET('HAVE_CUPS'):
+ if conf.CONFIG_SET('HAVE_CUPS'):
conf.DEFINE('HAVE_IPRINT', '1')
else:
Logs.warn("--enable-iprint=yes but cups support not sufficient")
@@ -564,7 +564,7 @@ msg.msg_acctrightslen = sizeof(fd);
conf.CHECK_FUNCS_IN('_et_list', 'com_err')
conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto')
- conf.CHECK_FUNCS_IN('des_set_key','crypto')
+ conf.CHECK_FUNCS_IN('des_set_key','crypto')
conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi') or \
@@ -607,9 +607,9 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h')
conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h')
conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h')
- conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h')
- conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h')
- conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, headers='krb5.h')
+ conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h')
+ conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h')
+ conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, headers='krb5.h')
conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',
@@ -706,24 +706,24 @@ int main(void) {
headers='krb5.h', lib='krb5',
addmain=False,
msg="Checking whether krb5_principal_get_realm is defined")
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
krb5_enctype enctype;
enctype = ENCTYPE_ARCFOUR_HMAC_MD5;
''',
'_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5',
headers='krb5.h', lib='krb5',
msg="Checking whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type definition is available");
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
krb5_keytype keytype;
keytype = KEYTYPE_ARCFOUR_56;
''',
'_HAVE_KEYTYPE_ARCFOUR_56',
headers='krb5.h', lib='krb5',
msg="Checking whether the HAVE_KEYTYPE_ARCFOUR_56 key type definition is available");
- if conf.CONFIG_SET('_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and conf.CONFIG_SET('_HAVE_KEYTYPE_ARCFOUR_56'):
+ if conf.CONFIG_SET('_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and conf.CONFIG_SET('_HAVE_KEYTYPE_ARCFOUR_56'):
conf.DEFINE('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', '1')
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
krb5_enctype enctype;
enctype = ENCTYPE_ARCFOUR_HMAC;
''',
@@ -731,7 +731,7 @@ enctype = ENCTYPE_ARCFOUR_HMAC;
headers='krb5.h', lib='krb5',
msg="Checking whether the ENCTYPE_ARCFOUR_HMAC key type definition is available");
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
krb5_context context;
krb5_keytab keytab;
krb5_init_context(&context);
@@ -900,7 +900,7 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
conf.CHECK_HEADERS('security/pam_ext.h security/_pam_macros.h')
conf.CHECK_HEADERS('pam/pam_ext.h pam/_pam_macros.h')
conf.CHECK_FUNCS_IN('pam_vsyslog', 'pam')
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
#if defined(HAVE_SECURITY_PAM_APPL_H)
#include <security/pam_appl.h>
#elif defined(HAVE_PAM_PAM_APPL_H)
@@ -911,7 +911,7 @@ pam_set_item(0, PAM_RHOST, 0);
'HAVE_PAM_RHOST',
lib='pam',
msg="Checking whether PAM_RHOST is available");
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
#if defined(HAVE_SECURITY_PAM_APPL_H)
#include <security/pam_appl.h>
#elif defined(HAVE_PAM_PAM_APPL_H)
@@ -922,7 +922,7 @@ pam_set_item(0, PAM_TTY, 0);
'HAVE_PAM_TTY',
lib='pam',
msg="Checking whether PAM_TTY is available");
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
#if (!defined(LINUX))
#define PAM_EXTERN extern
@@ -962,45 +962,45 @@ int i; i = PAM_RADIO_TYPE;
seteuid = False
if not seteuid:
seteuid = conf.CHECK_CODE('''
- #define AUTOCONF_TEST 1
- #define USE_SETREUID 1
- #include "./lib/util_sec.c"
- ''',
- 'USE_SETREUID',
- addmain=False,
- execute=True,
- msg="Checking whether setreuid is available")
+ #define AUTOCONF_TEST 1
+ #define USE_SETREUID 1
+ #include "./lib/util_sec.c"
+ ''',
+ 'USE_SETREUID',
+ addmain=False,
+ execute=True,
+ msg="Checking whether setreuid is available")
if not seteuid:
seteuid = conf.CHECK_CODE('''
- #define AUTOCONF_TEST 1
- #define USE_SETRESUID 1
- #include "./lib/util_sec.c"
- ''',
- 'USE_SETRESUID',
- addmain=False,
- execute=True,
- msg="Checking whether setresuid is available")
+ #define AUTOCONF_TEST 1
+ #define USE_SETRESUID 1
+ #include "./lib/util_sec.c"
+ ''',
+ 'USE_SETRESUID',
+ addmain=False,
+ execute=True,
+ msg="Checking whether setresuid is available")
if not seteuid:
seteuid = conf.CHECK_CODE('''
- #define AUTOCONF_TEST 1
- #define USE_SETEUID 1
- #include "./lib/util_sec.c"
- ''',
- 'USE_SETEUID',
- addmain=False,
- execute=True,
- msg="Checking whether seteuid is available")
+ #define AUTOCONF_TEST 1
+ #define USE_SETEUID 1
+ #include "./lib/util_sec.c"
+ ''',
+ 'USE_SETEUID',
+ addmain=False,
+ execute=True,
+ msg="Checking whether seteuid is available")
if not seteuid:
seteuid = conf.CHECK_CODE('''
- #define AUTOCONF_TEST 1
- #define USE_SETUIDX 1
- #include "./lib/util_sec.c"
- ''',
- 'USE_SETUIDX',
- addmain=False,
- execute=True,
- mandatory=True,
- msg="Checking whether setuidx is available")
+ #define AUTOCONF_TEST 1
+ #define USE_SETUIDX 1
+ #include "./lib/util_sec.c"
+ ''',
+ 'USE_SETUIDX',
+ addmain=False,
+ execute=True,
+ mandatory=True,
+ msg="Checking whether setuidx is available")
if Options.options.with_dnsupdate:
conf.CHECK_HEADERS('uuid/uuid.h')
conf.CHECK_FUNCS_IN('uuid_generate', 'uuid')
@@ -1021,15 +1021,15 @@ int i; i = PAM_RADIO_TYPE;
#include <bits/sockaddr.h>
#include <linux/netlink.h>
''',
- 'HAVE_LINUX_NETLINK_H',
+ 'HAVE_LINUX_NETLINK_H',
msg="Checking whether Linux netlink is available"):
conf.CHECK_CODE('''
#include <bits/sockaddr.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
''',
- 'HAVE_LINUX_RTNETLINK_H',
- msg='Checking whether Linux rtnetlink is available')
+ 'HAVE_LINUX_RTNETLINK_H',
+ msg='Checking whether Linux rtnetlink is available')
if conf.CHECK_TYPE('struct dirent64', headers='sys/types.h dirent.h') and conf.CONFIG_SET('HAVE_READDIR64'):
conf.DEFINE('HAVE_STRUCT_DIRENT64', '1')
else:
@@ -1038,18 +1038,18 @@ int i; i = PAM_RADIO_TYPE;
conf.CHECK_CODE('''
#include "../tests/fcntl_lock.c"
''',
- 'HAVE_FCNTL_LOCK',
- addmain=False,
- execute=True,
- msg='Checking whether fcntl locking is available')
+ 'HAVE_FCNTL_LOCK',
+ addmain=False,
+ execute=True,
+ msg='Checking whether fcntl locking is available')
conf.CHECK_CODE('''
#include "../tests/fcntl_lock64.c"
''',
- 'HAVE_BROKEN_FCNTL64_LOCKS',
- addmain=False,
- execute=True,
- msg='Checking whether fcntl64 locks are broken')
+ 'HAVE_BROKEN_FCNTL64_LOCKS',
+ addmain=False,
+ execute=True,
+ msg='Checking whether fcntl64 locks are broken')
if not conf.CONFIG_SET('HAVE_BROKEN_FCNTL64_LOCKS'):
conf.CHECK_CODE('''
@@ -1074,21 +1074,21 @@ exit(1);
#endif
}
''',
- 'HAVE_STRUCT_FLOCK64',
- addmain=False,
- execute=True,
- msg="Checking whether the flock64 struct is available")
+ 'HAVE_STRUCT_FLOCK64',
+ addmain=False,
+ execute=True,
+ msg="Checking whether the flock64 struct is available")
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec',
- define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris
+ define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec',
- define='HAVE_STRUCT_STAT_ST_MTIMENSEC') # BSD, if defined _POSIX_SOURCE
+ define='HAVE_STRUCT_STAT_ST_MTIMENSEC') # BSD, if defined _POSIX_SOURCE
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimespec.tv_nsec',
- define='HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC') # BSD, if not defined _POSIX_SOURCE
+ define='HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC') # BSD, if not defined _POSIX_SOURCE
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtime_n',
- define='HAVE_STRUCT_STAT_ST_MTIME_N') # AIX
+ define='HAVE_STRUCT_STAT_ST_MTIME_N') # AIX
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_umtime',
- define='HAVE_STRUCT_STAT_ST_UMTIME') # Tru64
+ define='HAVE_STRUCT_STAT_ST_UMTIME') # Tru64
if conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') or \
conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIMENSEC') or \
conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC') or \
@@ -1098,26 +1098,26 @@ exit(1);
# recent FreeBSD, NetBSD have creation timestamps called birthtime:
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_birthtime',
- define='HAVE_STRUCT_STAT_ST_BIRTHTIME')
+ define='HAVE_STRUCT_STAT_ST_BIRTHTIME')
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_birthtimespec.tv_nsec',
- define='HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC')
+ define='HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC')
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_birthtimensec',
- define='HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC')
+ define='HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC')
conf.CHECK_CODE('''
ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
''',
- 'HAVE_POSIX_FADVISE',
- msg='Checking whether posix_fadvise is available',
- headers='unistd.h fcntl.h')
+ 'HAVE_POSIX_FADVISE',
+ msg='Checking whether posix_fadvise is available',
+ headers='unistd.h fcntl.h')
for v in ['_SC_NGROUPS_MAX', '_SC_NPROC_ONLN', '_SC_NPROCESSORS_ONLN', '_SC_PAGESIZE' ]:
conf.CHECK_CODE('''
- #include <unistd.h>
- return sysconf(%s) == -1 ? 1 : 0;
- ''' % v,
- 'SYSCONF%s' % v,
- msg='Checking whether sysconf(%s) is available' % v)
+ #include <unistd.h>
+ return sysconf(%s) == -1 ? 1 : 0;
+ ''' % v,
+ 'SYSCONF%s' % v,
+ msg='Checking whether sysconf(%s) is available' % v)
conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')
@@ -1125,25 +1125,25 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
#include <sys/syscall.h>
#include <unistd.h>
syscall(SYS_initgroups, 16, NULL, NULL, 0);
- ''',
- 'HAVE_DARWIN_INITGROUPS',
- msg='Checking whether to use the Darwin-specific initgroups system call')
+ ''',
+ 'HAVE_DARWIN_INITGROUPS',
+ msg='Checking whether to use the Darwin-specific initgroups system call')
--
Samba Shared Repository
More information about the samba-cvs
mailing list