Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=350... Commit: 3505bc008d71100acf8b11bcfc494873904957ef Parent: c37913ef41d4284da754a7044f72f4419d4f6b1c Author: Fabio M. Di Nitto fdinitto@redhat.com AuthorDate: Wed Feb 2 10:34:58 2011 +0100 Committer: Fabio M. Di Nitto fdinitto@redhat.com CommitterDate: Thu Feb 3 21:27:55 2011 +0100
build: allow dbus notification code to be disabled
default is to build with dbus support
Signed-off-by: Fabio M. Di Nitto fdinitto@redhat.com Signed-off-by: Lon Hohberger lhh@redhat.com --- configure | 7 +++++++ make/defines.mk.input | 1 + rgmanager/src/daemons/Makefile | 6 +++++- 3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/configure b/configure index cde3be6..2644fa7 100755 --- a/configure +++ b/configure @@ -88,6 +88,7 @@ my %options = ( enable_legacy_code => $enable_legacy_code, enable_contrib => $enable_contrib, enable_pacemaker => $enable_pacemaker, + disable_dbus => $disable_dbus, somajor => $somajor, sominor => $sominor, release_version => $release_version, @@ -179,6 +180,7 @@ my $err = &GetOptions (%options, 'enable_legacy_code', 'enable_contrib', 'enable_pacemaker', + 'disable_dbus', 'without_common', 'without_config', 'without_cman', @@ -274,6 +276,7 @@ if ($help || !$err) { print "--enable_contrib\tEnable build of community contributed code/tools. (Default: no)\n"; print "--enable_legacy_code\tEnable build of old/obsolete/unsupported code/tools. (Default: no)\n"; print "--enable_pacemaker\tEnable building of Pacemaker-specific pieces\n"; + print "--disable_dbus\tDisable built-in support for dbus notifications. (Default: no)\n"; print "--without_common\tDisable common building (Default: enabled)\n"; print "--without_config\tDisable config building (Default: enabled)\n"; print "--without_cman\tDisable cman building (Default: enabled)\n"; @@ -620,6 +623,9 @@ if (!$enable_legacy_code) { if (!$enable_pacemaker) { $enable_pacemaker=""; } +if (!$disable_dbus) { + $disable_dbus=""; +} if (!$without_common) { $without_common=""; } @@ -775,6 +781,7 @@ while (<IFILE>) { $_ =~ s/@ENABLE_LEGACY_CODE@/$enable_legacy_code/; $_ =~ s/@ENABLE_CONTRIB@/$enable_contrib/; $_ =~ s/@ENABLE_PACEMAKER@/$enable_pacemaker/; + $_ =~ s/@DISABLE_DBUS@/$disable_dbus/; $_ =~ s/@DISABLE_COMMON@/$without_common/; $_ =~ s/@DISABLE_CONFIG@/$without_config/; $_ =~ s/@DISABLE_CMAN@/$without_cman/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 2834872..ca6a4d7 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -74,6 +74,7 @@ legacy_code ?= @ENABLE_LEGACY_CODE@ contrib_code ?= @ENABLE_CONTRIB@ enable_pacemaker ?= @ENABLE_PACEMAKER@ enable_gfs-kernel/src/gfs ?= @ENABLE_GFSKERNEL@ +disable_dbus ?= @DISABLE_DBUS@ without_common ?= @DISABLE_COMMON@ without_config ?= @DISABLE_CONFIG@ without_cman ?= @DISABLE_CMAN@ diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 9619990..7218c53 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -47,7 +47,6 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} -CFLAGS += `pkg-config --cflags dbus-1`
NOCCS_CFLAGS += -DNO_CCS
@@ -61,7 +60,12 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread + +# dbus support for notifications +ifndef disable_dbus +CFLAGS += -DDBUS `pkg-config --cflags dbus-1` DBUS_LDFLAGS += `pkg-config --libs dbus-1` +endif
LDDEPS += ../clulib/libclulib.a
cluster-commits@lists.fedorahosted.org