The branch, v4-7-test has been updated
via 3ef93ab vfs_glusterfs: include glusterfs/api/glfs.h without relying
on -I options
from 710c2ad ctdb-common: Call missing tevent_wakeup_recv() in
sock_daemon
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test
- Log -----------------------------------------------------------------
commit 3ef93aba153fc262ca093e6440457fbc170e50ce
Author: Niels de Vos <nde...@redhat.com>
Date: Tue Oct 31 15:52:49 2017 +0100
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 <abolo...@redhat.com>
Signed-off-by: Niels de Vos <nde...@redhat.com>
Reviewed-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
Autobuild-User(master): Günther Deschner <g...@samba.org>
Autobuild-Date(master): Thu Nov 9 22:37:30 CET 2017 on sn-devel-144
(cherry picked from commit 732ba3c84a2d40040550ea36b0478dd6af9a173a)
Autobuild-User(v4-7-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-7-test): Fri Nov 24 16:23:43 CET 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_glusterfs.c | 2 +-
source3/wscript | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 32074cb..55a9467 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 8fa51fb..f3b6d33 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:
--
Samba Shared Repository
