lib/util: fix waf configure tests for xattr functions on Mac OS 10.

metze

diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index ae3a4f2e058f91ceaa3b1a805219ae26a2aa5aaa..fea8ddf7cea000476a2c11c05b417b41f5bf2553 100644 (file)
--- 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 = [