diff options
| author | Andreas Schneider <asn@samba.org> | 2018-01-19 14:30:20 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-01-22 17:26:52 +0100 |
| commit | 39a6ea766dfe55d84ab2284b8d5ed01d66da11dd (patch) | |
| tree | 3cf819d08abef98ac90468731496b8572e355779 /source3/wscript | |
| parent | 87f105d76ce074bff08fd507d72568be88d48d00 (diff) | |
| download | samba-39a6ea766dfe55d84ab2284b8d5ed01d66da11dd.tar.gz | |
waf: Fix NFS quota support with libtirpc
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13238
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Jan 22 17:26:52 CET 2018 on sn-devel-144
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/source3/wscript b/source3/wscript index 1c711aa570b..8751833b221 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1446,10 +1446,22 @@ main() { conf.CHECK_STRUCTURE_MEMBER('struct dqblk', 'dqb_curbytes', define='HAVE_STRUCT_DQBLK_DQB_CURBYTES', headers='sys/quota.h') if conf.CHECK_HEADERS('rpcsvc/rquota.h', lib='tirpc'): - conf.DEFINE('HAVE_NFS_QUOTAS', '1') + # Optional structure member conf.CHECK_STRUCTURE_MEMBER('struct getquota_rslt', 'getquota_rslt_u', define='HAVE_GETQUOTA_RSLT_GETQUOTA_RSLT_U', - headers='rpcsvc/rquota.h') + headers='rpcsvc/rquota.h', + lib='tirpc') + + # Required fucntion for NFS quote support + conf.CHECK_CODE(''' + clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp"); + ''', + headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nettype.h rpc/xdr.h", + define='HAVE_NFS_QUOTAS', + msg='checking for clnt_create()', + execute=True, + local_include=False, + lib='tirpc') if (host_os.rfind('linux') > -1): conf.DEFINE('HAVE_QUOTACTL_LINUX', '1') @@ -1476,16 +1488,6 @@ main() { execute=True, addmain=False) - conf.CHECK_CODE(''' - clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp"); -''', - headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nettype.h rpc/xdr.h", - define='HAVE_NFS_QUOTAS', - msg='for NFS QUOTAS', - execute=True, - local_include=False, - lib='tirpc') - if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ conf.CONFIG_SET('HAVE_QUOTACTL_4A') or \ conf.CONFIG_SET('HAVE_QUOTACTL_4B') or \ |