The branch, master has been updated via 9e194cd... s3-waf: Check for additional options on *xattr via 5a023e7... s3-waf: Add darwin to the host_os-specific checks via b2546ee... s3-waf: Don't hardcode the name of the awk executable in wscript_build from 475531c... Standardize debug messages for read and write.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9e194cd673a0d0a56cd064bab38cbf30b468999d Author: Kai Blin <k...@samba.org> Date: Wed May 26 00:16:10 2010 +0200 s3-waf: Check for additional options on *xattr commit 5a023e73f7b1e788b49a05318b8de264aca085f0 Author: Kai Blin <k...@samba.org> Date: Tue May 25 23:57:41 2010 +0200 s3-waf: Add darwin to the host_os-specific checks commit b2546ee5571e644d3cb784f33517bf9f28c134d7 Author: Kai Blin <k...@samba.org> Date: Tue May 25 23:53:04 2010 +0200 s3-waf: Don't hardcode the name of the awk executable in wscript_build ----------------------------------------------------------------------- Summary of changes: source3/wscript | 10 ++++++++++ source3/wscript_build | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/wscript b/source3/wscript index 08044ec..166f7c5 100644 --- a/source3/wscript +++ b/source3/wscript @@ -323,6 +323,14 @@ updwtmp updwtmpx utimensat vsyslog _write __write __xstat conf.env.build_winbind = True conf.DEFINE('WITH_WINBIND', '1') + conf.find_program('awk', var='AWK') + + # Darwin has extra options to xattr-family functions + conf.CHECK_CODE('getxattr(0, 0, 0, 0, 0, 0);', + 'XATTR_ADD_OPT', + msg="Checking whether xattr interface takes additional options", + headers='sys/types.h attr/xattr.h sys/xattr.h') + #FIXME: Should just be set when krb5 and ldap requirements are fulfilled if Options.options.with_ads: conf.DEFINE('WITH_ADS', '1') @@ -438,6 +446,8 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''', elif host_os.rfind('qnx') > -1: conf.DEFINE('QNX', '1') conf.DEFINE('STAT_ST_BLOCKSIZE', '512') + elif (host_os.rfind('darwin') > -1): + conf.DEFINE('STAT_ST_BLOCKSIZE', '512') # FIXME: Add more checks here. else: print "Unknown host_os '%s', please report this to samba-techni...@samba.org" % host_os diff --git a/source3/wscript_build b/source3/wscript_build index 72ff748..2c74bf1 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -773,8 +773,6 @@ EVTLOGADM_SRC = '''${EVTLOGADM_SRC0} LIBS='ICONV' -bld.env.AWK = 'gawk' - bld.SAMBA_GENERATOR('build_options', source='include/config.h script/mkbuildoptions.awk', target='smbd/build_options.c', -- Samba Shared Repository