master - misc: cleanup ifdefs around RELEASE_VERSION

master - misc: cleanup ifdefs around RELEASE_VERSION

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=21204977fb4c3f711fab112fd27c18fea41f1c21
Commit:        21204977fb4c3f711fab112fd27c18fea41f1c21
Parent:        5e3bba7a37c1a255559068d80e6414d75bfd1c94
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Sep 24 14:31:03 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Sep 24 14:31:03 2008 +0200

misc: cleanup ifdefs around RELEASE_VERSION

RELEASE_VERSION is always set at build time now. Make it consistent
across the whole tree.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 fence/agents/rps10/rps10.c      |    5 -----
 fence/agents/xvm/fence_xvm.c    |    2 --
 fence/agents/xvm/fence_xvmd.c   |    2 --
 rgmanager/src/utils/clustat.c   |    4 ----
 rgmanager/src/utils/clusvcadm.c |    4 ----
 5 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/fence/agents/rps10/rps10.c b/fence/agents/rps10/rps10.c
index 8d36ffa..dea02d8 100644
--- a/fence/agents/rps10/rps10.c
+++ b/fence/agents/rps10/rps10.c
@@ -21,11 +21,6 @@
 #include <libgen.h>
 #include "copyright.cf"
 
-#ifndef RELEASE_VERSION
-#define RELEASE_VERSION "sandbox"
-#endif
-
-
 /*
  * Salt to taste.
  */
diff --git a/fence/agents/xvm/fence_xvm.c b/fence/agents/xvm/fence_xvm.c
index aa94cf2..fcad2af 100644
--- a/fence/agents/xvm/fence_xvm.c
+++ b/fence/agents/xvm/fence_xvm.c
@@ -341,9 +341,7 @@ main(int argc, char **argv)
 
 	if (args.flags & F_VERSION) {
 		printf("%s %s\n", basename(argv[0]), XVM_VERSION);
-#ifdef RELEASE_VERSION
 		printf("fence release %s\n", RELEASE_VERSION);
-#endif
 		exit(0);
 	}
 
diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c
index 2746c23..f656680 100644
--- a/fence/agents/xvm/fence_xvmd.c
+++ b/fence/agents/xvm/fence_xvmd.c
@@ -941,9 +941,7 @@ main(int argc, char **argv)
 
 	if (args.flags & F_VERSION) {
 		printf("%s %s\n", basename(argv[0]), XVM_VERSION);
-#ifdef RELEASE_VERSION
 		printf("fence release %s\n", RELEASE_VERSION);
-#endif
 		exit(0);
 	}
 
diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index dd64ce0..8a33fac 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -1074,12 +1074,8 @@ main(int argc, char **argv)
 		ret = !(cman_is_quorate(ch));
 		goto cleanup;
 	case VERSION_ONLY:
-#ifdef RELEASE_VERSION
 		printf("%s version %s\n", basename(argv[0]),
 		       RELEASE_VERSION);
-#else
-		printf("%s version DEVEL\n", basename(argv[0]));
-#endif
 		if (!ch)
 		       break;
 		goto cleanup;
diff --git a/rgmanager/src/utils/clusvcadm.c b/rgmanager/src/utils/clusvcadm.c
index 464e3c1..bfd9d51 100644
--- a/rgmanager/src/utils/clusvcadm.c
+++ b/rgmanager/src/utils/clusvcadm.c
@@ -297,11 +297,7 @@ main(int argc, char **argv)
 			node_specified = 1;
 			break;
 		case 'v':
-#ifdef RELEASE_VERSION
 			printf("%s\n", RELEASE_VERSION);
-#else
-			printf("DEVEL\n");
-#endif
 			return 0;
 		case 'Z':
 			actionstr = "freezing";