cluster: STABLE3 - build: add --without_resource_agents build option

cluster: STABLE3 - build: add --without_resource_agents build option

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7921652993e6ed57ff473ecd81ab45677a8cf2cc
Commit:        7921652993e6ed57ff473ecd81ab45677a8cf2cc
Parent:        54a876b89a9e899285f24bf79b2a31d6ea4d5081
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Jan 21 14:03:00 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Jan 21 14:03:00 2009 +0100

build: add --without_resource_agents build option

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure              |    7 +++++++
 make/defines.mk.input  |    1 +
 rgmanager/src/Makefile |    6 +++++-
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 895c640..d58377f 100755
--- a/configure
+++ b/configure
@@ -105,6 +105,7 @@ my %options = (
 	without_gfs => \$without_gfs,
 	without_gfs2 => \$without_gfs2,
 	without_rgmanager => \$without_rgmanager,
+	without_resource_agents => \$without_resource_agents,
 	without_bindings => \$without_bindings,
 	without_kernel_modules => \$without_kernel_modules,
 	disable_kernel_check => \$disable_kernel_check,
@@ -197,6 +198,7 @@ my $err = &GetOptions (\%options,
 		    'without_gfs',
 		    'without_gfs2',
 		    'without_rgmanager',
+		    'without_resource_agents',
 		    'without_bindings',
 		    'without_kernel_modules',
 		    'disable_kernel_check');
@@ -296,6 +298,7 @@ if ($help || !$err) {
   print "--without_gfs\tDisable gfs building  (Default: enabled)\n";
   print "--without_gfs2\tDisable gfs2 building  (Default: enabled)\n";
   print "--without_rgmanager\tDisable rgmanager building  (Default: enabled)\n";
+  print "--without_resource_agents\tDisable resource agents building  (Default: enabled)\n";
   print "--without_bindings\tDisable perl/python bindings building  (Default: enabled)\n";
   print "--without_kernel_modules\tDisable kernel modules building  (Default: enabled)\n";
   print "--disable_kernel_check\tDisable kernel version check  (Default: enabled)\n";
@@ -671,6 +674,9 @@ if (!$without_gfs2) {
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
+if (!$without_resource_agents) {
+  $without_resource_agents="";
+}
 if (!$without_bindings) {
   $without_bindings="";
 }
@@ -805,6 +811,7 @@ while (<IFILE>) {
   $_ =~ s/\@DISABLE_GFSKERNEL\@/$without_gfskernel/;
   $_ =~ s/\@DISABLE_GFS2\@/$without_gfs2/;
   $_ =~ s/\@DISABLE_RGMANAGER\@/$without_rgmanager/;
+  $_ =~ s/\@DISABLE_RESOURCE_AGENTS\@/$without_resource_agents/;
   $_ =~ s/\@DISABLE_BINDINGS\@/$without_bindings/;
 
   print OFILE "$_\n";
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 5cbffd1..34c7300 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -88,6 +88,7 @@ without_fence ?= @DISABLE_FENCE@
 without_gfs ?= @DISABLE_GFS@
 without_gfs2 ?= @DISABLE_GFS2@
 without_rgmanager ?= @DISABLE_RGMANAGER@
+without_resource_agents ?= @DISABLE_RESOURCE_AGENTS@
 without_bindings ?= @DISABLE_BINDINGS@
 
 THISDIR = $(shell echo $(CURDIR) | sed -e 's|$(OBJDIR)/||g')
diff --git a/rgmanager/src/Makefile b/rgmanager/src/Makefile
index c79d053..e6bd048 100644
--- a/rgmanager/src/Makefile
+++ b/rgmanager/src/Makefile
@@ -1,4 +1,8 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=resources clulib daemons utils
+SUBDIRS= clulib daemons utils
+
+ifndef without_resource_agents
+SUBDIRS += resources
+endif