[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Cluster-devel] [PATCH] fenced: send dbus signal when node is fenced



On 02/02/2011 11:35 PM, Ryan O'Hara wrote:
> diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
> index 7455544..d412001 100644
> --- a/fence/fenced/Makefile
> +++ b/fence/fenced/Makefile
> @@ -16,19 +16,22 @@ OBJS=	config.o \
>  	main.o \
>  	member_cman.o \
>  	recover.o \
> -	logging.o
> +	logging.o \
> +	dbus.o
>  
> -CFLAGS += -D_FILE_OFFSET_BITS=64
> +CFLAGS += -D_FILE_OFFSET_BITS=64 -DDBUS
>  CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} -I${corosyncincdir}
>  CFLAGS += -I${fenceincdir} -I${fencedincdir}
>  CFLAGS += -I$(S) -I$(S)/../include -I$(SRCDIR)/group/lib
>  CFLAGS += -I${incdir}
> +CFLAGS += $(shell pkg-config --cflags dbus-1)
>  
>  LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
>  LDFLAGS += -L${logtlibdir} -L${fencelibdir} -llogthread -lfence
>  LDFLAGS += -L${corosynclibdir} -lcpg -lpthread
>  LDFLAGS += -L../../group/lib -l group
>  LDFLAGS += -L${libdir}
> +LDFLAGS += $(shell pkg-config --libs dbus-1)
>  
>  LDDEPS += ../../group/lib/libgroup.a
>  

since we got the build system patch done, it is best to align this
Makefile to rgmanager one. see commit
5d044c3b62d51c688257faecd69bbf3112d7728f in STABLE31

[snip]
# dbus support for notifications
ifndef disable_dbus
CFLAGS += -DDBUS `pkg-config --cflags dbus-1`
DBUS_LDFLAGS += `pkg-config --libs dbus-1`
endif

this way it is all confined in one chunk and can be driven (on/off) by
configure. Default is dbus enabled. --disable_dbus will stop defining
DBUS and requiring dbus pkgconfig bits.

Thanks
Fabio




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]