diff options
| author | Christof Schmitt <cs@samba.org> | 2015-02-18 10:13:33 -0700 |
|---|---|---|
| committer | Christof Schmitt <cs@samba.org> | 2015-03-02 22:31:07 +0100 |
| commit | f826c86bf1dcaf47a2c4f42eb4647ca6e1ad75aa (patch) | |
| tree | 118c4f7888a74b4809aa6cb748a4aa2ab48bc4a0 /source3 | |
| parent | 1264a4efd9a407869bf34c13b3883c544b6ff948 (diff) | |
| download | samba-f826c86bf1dcaf47a2c4f42eb4647ca6e1ad75aa.tar.gz samba-f826c86bf1dcaf47a2c4f42eb4647ca6e1ad75aa.tar.xz samba-f826c86bf1dcaf47a2c4f42eb4647ca6e1ad75aa.zip | |
gpfs: Look for gpfs header files also in /usr/lpp/mmfs/include/
That is the default directory for the gpfs header files.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/wscript_build | 3 | ||||
| -rw-r--r-- | source3/wscript | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index e2d4fde242..7fe66ecfef 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -279,7 +279,8 @@ bld.SAMBA3_MODULE('vfs_gpfs', deps='NFS4_ACLS non_posix_acls', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs')) + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'), + includes=bld.CONFIG_GET('CPPPATH_GPFS')) vfs_notify_fam_deps='samba-util ' if bld.CONFIG_SET('SAMBA_FAM_LIBS'): diff --git a/source3/wscript b/source3/wscript index f1dda515bc..63bca9d060 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1492,7 +1492,8 @@ main() { Logs.warn("pthreadpool support cannot be enabled when pthread support was not found") conf.undefine('WITH_PTHREADPOOL') - if conf.CHECK_HEADERS('gpfs_fcntl.h'): + conf.env['CPPPATH_GPFS'] = '/usr/lpp/mmfs/include/' + if conf.CHECK_HEADERS('gpfs_fcntl.h', False, False, "gpfs"): conf.DEFINE('HAVE_GPFS', '1') if (conf.CHECK_HEADERS('linux/ioctl.h sys/ioctl.h linux/fs.h') and |