sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

vfs_glusterfs: include glusterfs/api/glfs.h without relying on -I options

Browse Source 
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
This commit is contained in:
Niels de Vos 2017-10-31 15:52:49 +01:00 committed by Günther Deschner
parent 7470b9b18a
commit 732ba3c84a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/modules/vfs_glusterfs.c
View File

@ -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"

4
source3/wscript
View File

@ -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: