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>

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index e2d4fde242f52af08dde38aa5e63193ec37ba8a7..7fe66ecfef91f6eb8c1fe48d9e0235add64904ff 100644 (file)
--- 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 f1dda515bc8fb181910667b2553023c0ce6bf121..63bca9d060623ef05dbe85afc4fd462663dcf7bd 100644 (file)
--- 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