cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Fabio M. Di Nitto <fdinitto@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH] fenced: send dbus signal when node is fenced
Date: Thu, 03 Feb 2011 07:24:19 +0100	[thread overview]
Message-ID: <4D4A4A13.50406@redhat.com> (raw)
In-Reply-To: <1296686142-22696-1-git-send-email-rohara@redhat.com>

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





  parent reply	other threads:[~2011-02-03  6:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-02 22:35 [Cluster-devel] [PATCH] fenced: send dbus signal when node is fenced Ryan O'Hara
2011-02-02 22:56 ` Lon Hohberger
2011-02-02 23:30   ` Lon Hohberger
2011-02-03  6:24 ` Fabio M. Di Nitto [this message]
2011-02-03 14:53   ` Ryan O'Hara
2011-02-03 17:43 ` David Teigland
  -- strict thread matches above, loose matches on Subject: below --
2011-02-03 19:26 Ryan O'Hara
2011-02-03 19:45 ` David Teigland
2011-02-02 21:28 Ryan O'Hara
2011-02-02 22:55 ` Lon Hohberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D4A4A13.50406@redhat.com \
    --to=fdinitto@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).