public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* master - build: rename --enable_xen to --enable_virt
@ 2008-08-22 10:52 Fabio M. Di Nitto
  0 siblings, 0 replies; only message in thread
From: Fabio M. Di Nitto @ 2008-08-22 10:52 UTC (permalink / raw)
  To: cluster-cvs-relay

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f0a696e537e1c8bba1dbf6d81cb569ed68166430
Commit:        f0a696e537e1c8bba1dbf6d81cb569ed68166430
Parent:        ae10fb681b0ac8449061bb57bd100b5f2a42994e
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Fri Aug 22 12:30:19 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Aug 22 12:30:19 2008 +0200

build: rename --enable_xen to --enable_virt

xvm supports all virtualization implementations that libvirt supports
and those are more than just xen.

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

diff --git a/configure b/configure
index 858076a..ab3691a 100755
--- a/configure
+++ b/configure
@@ -87,7 +87,7 @@ my %options = (
 	enable_crack_of_the_day => \$enable_crack_of_the_day,
 	enable_legacy_code => \$enable_legacy_code,
 	enable_contrib => \$enable_contrib,
-	enable_xen => \$enable_xen,
+	enable_virt => \$enable_virt,
 	somajor => \$somajor,
 	sominor => \$sominor,
 	release_version => \$release_version,
@@ -177,7 +177,7 @@ my $err = &GetOptions (\%options,
 		    'enable_crack_of_the_day',
 		    'enable_legacy_code',
 		    'enable_contrib',
-		    'enable_xen',
+		    'enable_virt',
 		    'without_ccs',
 		    'without_cman',
 		    'without_dlm',
@@ -270,7 +270,7 @@ 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_xen\tEnable building of Xen-specific pieces\n";
+  print "--enable_virt\tEnable building of virtualization code (Default: disabled\n";
   print "--without_ccs\tDisable ccs building  (Default: enabled)\n";
   print "--without_cman\tDisable cman building  (Default: enabled)\n";
   print "--without_dlm\tDisable dlm building  (Default: enabled)\n";
@@ -610,8 +610,8 @@ if (!$enable_legacy_code) {
   print "\n********************************************************************************************\n";
   $cflags="${cflags} -DLEGACY_CODE";
 }
-if (!$enable_xen) {
-  $enable_xen="";
+if (!$enable_virt) {
+  $enable_virt="";
 }
 if (!$without_ccs) {
   $without_ccs="";
@@ -680,7 +680,7 @@ 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_xen has been specified\n\n";
+  print "\nNOTE: xvm will build only if --enable_virt has been specified\n\n";
   $fence_agents = $all_fence
 }
 
@@ -755,7 +755,7 @@ 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_XEN\@/$enable_xen/;
+  $_ =~ s/\@ENABLE_VIRT\@/$enable_virt/;
   $_ =~ s/\@DISABLE_CCS\@/$without_ccs/;
   $_ =~ s/\@DISABLE_CMAN\@/$without_cman/;
   $_ =~ s/\@DISABLE_DLM\@/$without_dlm/;
diff --git a/fence/agents/Makefile b/fence/agents/Makefile
index 209da12..7c963ae 100644
--- a/fence/agents/Makefile
+++ b/fence/agents/Makefile
@@ -7,7 +7,7 @@ all: ${SUBDIRS}
 %:
 	set -e && \
 	for i in ${SUBDIRS}; do \
-		if [ "$$i" = "xvm" ] && [ "${enable_xen}" != "1" ] && [ "$@" != "clean" ]; then \
+		if [ "$$i" = "xvm" ] && [ "${enable_virt}" != "1" ] && [ "$@" != "clean" ]; then \
 			continue; \
 		else \
 			${MAKE} -C $$i $@; \
diff --git a/make/defines.mk.input b/make/defines.mk.input
index d09adf6..f01447d 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -70,7 +70,7 @@ fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
 experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
 legacy_code ?= @ENABLE_LEGACY_CODE@
 contrib_code ?= @ENABLE_CONTRIB@
-enable_xen ?= @ENABLE_XEN@
+enable_virt ?= @ENABLE_VIRT@
 without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
 without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
 without_cman/lib ?= @DISABLE_CMAN@


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-08-22 10:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-22 10:52 master - build: rename --enable_xen to --enable_virt Fabio M. Di Nitto

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 read-only IMAP folder(s) and NNTP newsgroup(s).