diff options
| author | Andrea Bolognani <abologna@redhat.com> | 2017-10-25 17:16:14 +0200 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2017-11-08 11:10:44 +0000 |
| commit | 684d62276af37c260671024ce17cb281f493b289 (patch) | |
| tree | 9cf1eada1063b43ec60f88bef1d7b2963f3439b0 /api | |
| parent | b79f29694165a65666d4177619d57b54641e4255 (diff) | |
*.pc: Fix include path in Cflags
The include path in glusterfs-api.pc looks like
-I${includedir}/glusterfs
However, client code will include the glusterfs headers using
#include <glusterfs/api/glfs.h>
rather than
#include <api/glfs.h>
which makes the "/glusterfs" part entirely unnecessary.
More importantly, on some platforms such as FreeBSD, the header files
for glusterfs will be installed in /usr/local/include, which is *not*
part of the compiler's default include path, so compilation will fail
with something like
fatal error: 'glusterfs/api/glfs.h' file not found
#include <glusterfs/api/glfs.h>
^~~~~~~~~~~~~~~~~~~~~~
The fix is to simply drop the extra "/glusterfs". The same change
is applied to other *.pc files as well, althought I haven't actually
tested those.
A test program (gfapi-load-volfile) and the glfsxmp example
application were using the wrong include paths, so they had to be
fixed as well.
Change-Id: I9a16de47fee7ab9c12d1cb823bbe061a69352670
BUG: 1508947
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/examples/glfsxmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/examples/glfsxmp.c b/api/examples/glfsxmp.c index 7ff3f0eb7ee..a8e2cc93381 100644 --- a/api/examples/glfsxmp.c +++ b/api/examples/glfsxmp.c @@ -1,8 +1,8 @@ #include <stdio.h> #include <stdlib.h> #include <errno.h> -#include "api/glfs.h" -#include "api/glfs-handles.h" +#include <glusterfs/api/glfs.h> +#include <glusterfs/api/glfs-handles.h> #include <string.h> #include <time.h> |