diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-01 15:01:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-02 02:13:49 +0200 |
| commit | e9d797e153ae95561dbb10b56a41281b2472f137 (patch) | |
| tree | 1a79b7c8d08352f7a9ead4c15b5c46d2a7f6aeaa /lib/replace/wscript | |
| parent | f9b7cd53b9fe253b122cb545c2dd1be073ab0592 (diff) | |
| download | samba-e9d797e153ae95561dbb10b56a41281b2472f137.tar.gz samba-e9d797e153ae95561dbb10b56a41281b2472f137.tar.bz2 samba-e9d797e153ae95561dbb10b56a41281b2472f137.zip | |
lib/replace: Merge remaining xattr test details from lib/util
I prefer the longer XATTR_ADDITIONAL_OPTIONS define and the NULL
rather than 0 values in the getxattr test.
Andrew Bartlett
Diffstat (limited to 'lib/replace/wscript')
| -rw-r--r-- | lib/replace/wscript | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index 1d1480caec..6331b884ed 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -213,11 +213,13 @@ def configure(conf): conf.SET_TARGET_TYPE('attr', 'EMPTY') + xattr_headers='sys/attributes.h attr/xattr.h sys/xattr.h' + conf.CHECK_FUNCS_IN(''' fgetxattr flistea flistxattr fremovexattr fsetxattr getxattr listxattr removexattr setxattr -''', 'attr', checklibc=True) +''', 'attr', checklibc=True, headers=xattr_headers) # We need to check for linux xattrs first, as we do not wish to link to -lattr # (the XFS compat API) on Linux systems with the native xattr API @@ -229,7 +231,7 @@ extattr_get_fd extattr_get_file extattr_list_fd extattr_list_file extattr_set_fd extattr_set_file fgetea flistea fremoveea fsetea getea listea removeea setea -''', 'attr', checklibc=True) +''', 'attr', checklibc=True, headers=xattr_headers) if (conf.CONFIG_SET('HAVE_ATTR_LISTF') or conf.CONFIG_SET('HAVE_EXTATTR_LIST_FD') or @@ -238,10 +240,10 @@ removeea setea conf.DEFINE('HAVE_XATTR_SUPPORT', 1) # 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') + conf.CHECK_CODE('getxattr(NULL, NULL, NULL, 0, 0, 0)', + headers=xattr_headers, local_include=False, + define='XATTR_ADDITIONAL_OPTIONS', + msg="Checking whether xattr interface takes additional options") conf.CHECK_FUNCS_IN('dlopen dlsym dlerror dlclose', 'dl', checklibc=True, headers='dlfcn.h dl.h') |