[GEDI] [PATCH] vfs_glusterfs: include glusterfs/api/glfs.h without relying on -I options

Niels de Vos ndevos at redhat.com
Tue Oct 31 14:52:49 UTC 2017

The glfs.h header file has always resided under glusterfs/api/ in the
standard include directory. The glusterfs-api.pc file adds the unneeded
-I${includedir}/glusterfs compiler option. This option will be removed
from future versions of the pkg-config file.

This change can safely be backported to older versions if there is a
need to have them build against glusterfs-3.13 or newer.

URL: https://review.gluster.org/18576
CC: Andrea Bolognani <abologna at redhat.com>
Signed-off-by: Niels de Vos <ndevos at redhat.com>
 source3/modules/vfs_glusterfs.c | 2 +-
 source3/wscript                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 3534ed7027e..8c245573b55 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -38,7 +38,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include <stdio.h>
-#include "api/glfs.h"
+#include <glusterfs/api/glfs.h>
 #include "lib/util/dlinklist.h"
 #include "lib/util/tevent_unix.h"
 #include "smbd/globals.h"
diff --git a/source3/wscript b/source3/wscript
index 3638abab202..01b77f12e4e 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1580,10 +1580,10 @@ main() {
     if Options.options.with_glusterfs:
         conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs',
                        msg='Checking for glusterfs-api >= 4', uselib_store="GFAPI")
-        conf.CHECK_HEADERS('api/glfs.h', lib='gfapi')
+        conf.CHECK_HEADERS('glusterfs/api/glfs.h', lib='gfapi')
         conf.CHECK_LIB('gfapi', shlib=True)
-        if conf.CONFIG_SET('HAVE_API_GLFS_H'):
             if Options.options.with_acl_support:
                  conf.DEFINE('HAVE_GLUSTERFS', '1')

More information about the integration mailing list