cluster: STABLE3 - build: enable fence_xvm by default

cluster: STABLE3 - build: enable fence_xvm by default

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=abb95f34971251d265f32ac38b7588b158e121a3
Commit:        abb95f34971251d265f32ac38b7588b158e121a3
Parent:        106f4b63766f111e01fa140c91dd24fbecdf8f81
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Tue Jun 23 06:18:19 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Jun 23 06:18:19 2009 +0200

build: enable fence_xvm by default

Historically building fence_xvm was complex and required xen libs
that are architecture specific.

fence_xvm has long dropped libxen in favour of libvirt that's been
ported and build on all architecture and it's part of all distribution.

Drop the special casing in the build system.

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

diff --git a/configure b/configure
index cf9d730..da3c862 100755
--- a/configure
+++ b/configure
@@ -87,7 +87,6 @@ my %options = (
 	enable_crack_of_the_day => \$enable_crack_of_the_day,
 	enable_legacy_code => \$enable_legacy_code,
 	enable_contrib => \$enable_contrib,
-	enable_virt => \$enable_virt,
 	enable_pacemaker => \$enable_pacemaker,
 	somajor => \$somajor,
 	sominor => \$sominor,
@@ -179,7 +178,6 @@ my $err = &GetOptions (\%options,
 		    'enable_crack_of_the_day',
 		    'enable_legacy_code',
 		    'enable_contrib',
-		    'enable_virt',
 		    'enable_pacemaker',
 		    'without_common',
 		    'without_config',
@@ -275,7 +273,6 @@ if ($help || !$err) {
   print "--enable_crack_of_the_day\tEnable build of highly experimental features that rely on code that is not yet available for general use. (Default: no)\n";
   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_virt\tEnable building of virtualization code (Default: disabled\n";
   print "--enable_pacemaker\tEnable building of Pacemaker-specific pieces\n";
   print "--without_common\tDisable common building  (Default: enabled)\n";
   print "--without_config\tDisable config building  (Default: enabled)\n";
@@ -620,9 +617,6 @@ if (!$enable_legacy_code) {
   print "\n********************************************************************************************\n";
   $cflags="${cflags} -DLEGACY_CODE";
 }
-if (!$enable_virt) {
-  $enable_virt="";
-}
 if (!$enable_pacemaker) {
   $enable_pacemaker=""
 }
@@ -702,7 +696,6 @@ if ($fence_agents eq "help") {
 
 if ((!$fence_agents) || ($fence_agents eq "all")) {
   print "\nThe following fence agents will be build on this system:\n$all_fence\n";
-  print "\nNOTE: xvm will build only if --enable_virt has been specified\n\n";
   $fence_agents = $all_fence
 }
 
@@ -781,7 +774,6 @@ while (<IFILE>) {
   $_ =~ s/\@ENABLE_CRACK_OF_THE_DAY\@/$enable_crack_of_the_day/;
   $_ =~ s/\@ENABLE_LEGACY_CODE\@/$enable_legacy_code/;
   $_ =~ s/\@ENABLE_CONTRIB\@/$enable_contrib/;
-  $_ =~ s/\@ENABLE_VIRT\@/$enable_virt/;
   $_ =~ s/\@ENABLE_PACEMAKER\@/$enable_pacemaker/;
   $_ =~ s/\@DISABLE_COMMON\@/$without_common/;
   $_ =~ s/\@DISABLE_CONFIG\@/$without_config/;
diff --git a/fence/agents/Makefile b/fence/agents/Makefile
index f0f2dc9..e183b73 100644
--- a/fence/agents/Makefile
+++ b/fence/agents/Makefile
@@ -1,17 +1,6 @@
 include ../../make/defines.mk
+include $(OBJDIR)/make/passthrough.mk
 
 ifdef fence_agents
 SUBDIRS = ${fence_agents} lib nss_wrapper
 endif
-
-all: ${SUBDIRS}
-
-%:
-	set -e && \
-	for i in ${SUBDIRS}; do \
-		if [ "$$i" = "xvm" ] && [ "${enable_virt}" != "1" ] && [ "$@" != "clean" ]; then \
-			continue; \
-		else \
-			${MAKE} -C $$i $@; \
-		fi; \
-	done
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 66184e3..52e9b88 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -73,7 +73,6 @@ fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
 experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
 legacy_code ?= @ENABLE_LEGACY_CODE@
 contrib_code ?= @ENABLE_CONTRIB@
-enable_virt ?= @ENABLE_VIRT@
 enable_pacemaker ?= @ENABLE_PACEMAKER@
 without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
 without_common ?= @DISABLE_COMMON@