[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri May 14 06:35:31 MDT 2010
The branch, master has been updated
via bd6d76d... lib/util: fix waf configure tests for xattr functions on Mac OS 10.
from 348b4b9... Make pcap headers private
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bd6d76d77621c1dc92262c48204b65455a214b62
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri May 14 13:58:37 2010 +0200
lib/util: fix waf configure tests for xattr functions on Mac OS 10.
metze
-----------------------------------------------------------------------
Summary of changes:
lib/util/wscript_configure | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index ae3a4f2..fea8ddf 100644
--- a/lib/util/wscript_configure
+++ b/lib/util/wscript_configure
@@ -6,18 +6,20 @@ conf.CHECK_FUNCS_IN('backtrace', 'execinfo', checklibc=True, headers='execinfo.h
conf.CHECK_FUNCS('sigprocmask sigblock sigaction')
-conf.CHECK_FUNCS_IN('flistxattr', 'attr', checklibc=True, headers='sys/attributes.h attr/xattr.h sys/xattr.h')
-
-conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h')
+xattr_headers='sys/attributes.h attr/xattr.h sys/xattr.h'
+conf.CHECK_FUNCS_IN('flistxattr', 'attr', checklibc=True, headers=xattr_headers)
conf.CHECK_CODE('getxattr(NULL, NULL, NULL, 0, 0, 0)',
- define='XATTR_ADDITIONAL_OPTIONS')
+ headers=xattr_headers, local_include=False,
+ define='XATTR_ADDITIONAL_OPTIONS',
+ msg='Checking for darwin xattr api')
if conf.CONFIG_SET('HAVE_FLISTXATTR'):
conf.DEFINE('HAVE_XATTR_SUPPORT', 1)
+conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h')
# all the different ways of doing statfs
statfs_types = [
--
Samba Shared Repository
More information about the samba-cvs
mailing list