[build] fix build with non-standard knet location

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/exec/Makefile.am b/exec/Makefile.am
index 7ccac9eeff110456dba7051e025bd9f87a7fbc1b..9535156395eaf3c8857714d59883d3efd16f79eb 100644 (file)
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -67,7 +67,7 @@ endif
 
 corosync_CPPFLAGS      = -DLOGCONFIG_USE_ICMAP=1
 
-corosync_CFLAGS         = $(statgrab_CFLAGS) $(libsystemd_CFLAGS)
+corosync_CFLAGS         = $(statgrab_CFLAGS) $(libsystemd_CFLAGS) $(knet_CFLAGS)
 
 corosync_LDADD         = libtotem_pg.la ../common_lib/libcorosync_common.la \
                          $(LIBQB_LIBS) $(statgrab_LIBS) $(libsystemd_LIBS)

diff --git a/include/corosync/totem/totem.h b/include/corosync/totem/totem.h
index d1a6651b608e4139a7ef76d680f50210ce6fe990..3b7ff77f38d2a522a623ea857181238891f755d7 100644 (file)
--- a/include/corosync/totem/totem.h
+++ b/include/corosync/totem/totem.h
@@ -35,7 +35,7 @@
 #ifndef TOTEM_H_DEFINED
 #define TOTEM_H_DEFINED
 #include "totemip.h"
-#include "libknet.h"
+#include <libknet.h>
 #include <corosync/hdb.h>
 #include <corosync/totem/totemstats.h>
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9e6745613a6b2c95292da6f725e865f814ae72a9..0684ddbc6b5c0320ea37211801d71c8fba2555c8 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -42,6 +42,8 @@ if INSTALL_XMLCONF
 bin_SCRIPTS            += corosync-xmlproc
 endif
 
+AM_CFLAGS              = $(knet_CFLAGS)
+
 EXTRA_DIST             = $(bin_SCRIPTS) corosync-xmlproc.sh \
                          corosync-notifyd.sysconfig.example \
                           corosync-blackbox.sh