Просмотр исходного кода

[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>
Fabio M. Di Nitto 8 лет назад
Родитель
Сommit
1411608a81
3 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      exec/Makefile.am
  2. 1 1
      include/corosync/totem/totem.h
  3. 2 0
      tools/Makefile.am

+ 1 - 1
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)

+ 1 - 1
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>
 

+ 2 - 0
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