Gitweb:
http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=7181...
Commit: 7181608a3a497bff3d9d1306e77503dbfc4c32f5
Parent: a8e523a8ed9df5d54d9c41349a19e1c95252a45e
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Feb 18 20:24:05 2011 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Feb 18 20:24:05 2011 +0100
build: add support for dbus notification
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
configure.ac | 11 ++++++++++-
fence/fenced/Makefile.am | 11 ++++++++++-
fence/fenced/main.c | 4 +---
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4da5a0f..3393315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,9 +109,18 @@ AC_CHECK_FUNCS([ftruncate gettimeofday memset mkfifo select socket
strcasecmp st
# local options
AC_ARG_ENABLE([debug],
- [ --enable-debug enable debug build. ],
+ [ --enable-debug enable debug build [default=no].],
[ default="no" ])
+AC_ARG_ENABLE([dbus],
+ [ --enable-dbus enable support for dbus [default=yes]. ],
+ [ default="yes" ])
+
+AM_CONDITIONAL(BUILD_DBUS, test "x${enable_dbus}" != "xno")
+if test "x${enable_dbus}" != "xno"; then
+ PKG_CHECK_MODULES([dbus],[dbus-1])
+fi
+
AC_ARG_WITH([syslogfacility],
[ --syslogfacility=FACILITY
cluster default syslog facility. ],
diff --git a/fence/fenced/Makefile.am b/fence/fenced/Makefile.am
index 3bb6dfe..f309383 100644
--- a/fence/fenced/Makefile.am
+++ b/fence/fenced/Makefile.am
@@ -4,7 +4,8 @@ sbin_PROGRAMS = fenced
noinst_HEADERS = config.h fd.h fenced.h
-fenced_SOURCES = config.c cpg.c logging.c main.c member_cman.c recover.c
+fenced_SOURCES = config.c cpg.c dbus.c \
+ logging.c main.c member_cman.c recover.c
fenced_CPPFLAGS = -D_FILE_OFFSET_BITS=64 \
-I$(top_srcdir)/fence/include \
@@ -17,4 +18,12 @@ fenced_CFLAGS = $(logt_CFLAGS) $(cfg_CFLAGS) \
fenced_LDFLAGS = $(logt_LIBS) $(cfg_LIBS) $(cpg_LIBS) $(quorum_LIBS) \
-lpthread
+if BUILD_DBUS
+fenced_CPPFLAGS += -DDBUS
+
+fenced_CFLAGS += $(dbus_CFLAGS)
+
+fenced_LDFLAGS += $(dbus_LIBS)
+endif
+
fenced_LDADD = $(top_builddir)/fence/libfence/libfence.la
diff --git a/fence/fenced/main.c b/fence/fenced/main.c
index 555fb36..a20aae2 100644
--- a/fence/fenced/main.c
+++ b/fence/fenced/main.c
@@ -988,11 +988,9 @@ int main(int argc, char **argv)
loop();
-<<<<<<< HEAD
-=======
fd_dbus_exit();
unlink(LOCKFILE_NAME);
->>>>>>> 4536bfb... fenced: send dbus signal when node is fenced
+
return 0;
}