From 3436113f5853334d89e437881633cde0472f916b Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 31 Oct 2017 15:52:49 +0100 Subject: [PATCH] vfs_glusterfs: include glusterfs/api/glfs.h without relying on -I options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13125 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 Signed-off-by: Niels de Vos Reviewed-by: Andreas Schneider Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Nov 9 22:37:30 CET 2017 on sn-devel-144 (cherry picked from commit 732ba3c84a2d40040550ea36b0478dd6af9a173a) --- 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 32074cba4eb..55a94674488 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 -#include "api/glfs.h" +#include #include "lib/util/dlinklist.h" #include "lib/util/tevent_unix.h" #include "smbd/globals.h" diff --git a/source3/wscript b/source3/wscript index 8fa51fb7740..f3b6d330121 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1588,10 +1588,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 conf.CONFIG_SET('HAVE_GLUSTERFS_API_GLFS_H'): if Options.options.with_acl_support: conf.DEFINE('HAVE_GLUSTERFS', '1') else: -- 2.13.6