diff options
| author | Niels de Vos <ndevos@redhat.com> | 2017-10-31 15:52:49 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2017-11-09 22:37:30 +0100 |
| commit | 732ba3c84a2d40040550ea36b0478dd6af9a173a (patch) | |
| tree | 59f8c0415720cd46f51878f21f15db0977aa22de /source3 | |
| parent | 7470b9b18af282a742929d3fc90f4be5520428a1 (diff) | |
| download | samba-732ba3c84a2d40040550ea36b0478dd6af9a173a.tar.gz | |
vfs_glusterfs: include glusterfs/api/glfs.h without relying on -I options
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 <abologna@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Thu Nov 9 22:37:30 CET 2017 on sn-devel-144
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_glusterfs.c | 2 | ||||
| -rw-r--r-- | 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 814433488e4..e311f5f6efe 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 conf.CONFIG_SET('HAVE_GLUSTERFS_API_GLFS_H'): if Options.options.with_acl_support: conf.DEFINE('HAVE_GLUSTERFS', '1') else: |