cluster: STABLE31 - build: remove --enable_pacemaker config option

Fabio M. Di Nitto fabbione at fedoraproject.org
Tue Nov 2 18:50:35 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6502e1ed197687598872e6ac3af30e4a921ff21e
Commit:        6502e1ed197687598872e6ac3af30e4a921ff21e
Parent:        0616c9622e5f67fd73cd7917b69f2e2f775896cc
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Tue Nov 2 20:49:53 2010 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Nov 2 20:49:53 2010 +0100

build: remove --enable_pacemaker config option

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 configure             |    7 -------
 make/defines.mk.input |    1 -
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 2e9f8bc..7e1aca7 100755
--- a/configure
+++ b/configure
@@ -73,7 +73,6 @@ my %options = (
 	confdir => \$confdir,
 	conffile => \$conffile,
 	enable_contrib => \$enable_contrib,
-	enable_pacemaker => \$enable_pacemaker,
 	somajor => \$somajor,
 	sominor => \$sominor,
 	release_version => \$release_version,
@@ -145,7 +144,6 @@ my $err = &GetOptions (\%options,
 		    'sominor=s',
 		    'release_version=s',
 		    'enable_contrib',
-		    'enable_pacemaker',
 		    'without_common',
 		    'without_config',
 		    'without_cman',
@@ -221,7 +219,6 @@ if ($help || !$err) {
   print "--ldapincdir=\tthe base directory for ldap include files.  (Default: {incdir})\n";
   print "--ldaplibdir=\tthe base directory for ldap libraries.  (Default: {libdir})\n";
   print "--enable_contrib\tEnable build of community contributed code/tools.  (Default: no)\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";
   print "--without_cman\tDisable cman building  (Default: enabled)\n";
@@ -507,9 +504,6 @@ if (!$conffile) {
 if (!$enable_contrib) {
   $enable_contrib="";
 }
-if (!$enable_pacemaker) {
-  $enable_pacemaker="";
-}
 if (!$without_common) {
   $without_common="";
 }
@@ -604,7 +598,6 @@ while (<IFILE>) {
   $_ =~ s/\@CONFDIR\@/$confdir/;
   $_ =~ s/\@CONFFILE\@/$conffile/;
   $_ =~ s/\@ENABLE_CONTRIB\@/$enable_contrib/;
-  $_ =~ s/\@ENABLE_PACEMAKER\@/$enable_pacemaker/;
   $_ =~ 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 5cb006a..3751cf5 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -58,7 +58,6 @@ ldaplibdir ?= @LDAPLIBDIR@
 zlibincdir ?= @ZLIBINCDIR@
 zliblibdir ?= @ZLIBLIBDIR@
 contrib_code ?= @ENABLE_CONTRIB@
-enable_pacemaker ?= @ENABLE_PACEMAKER@
 without_common ?= @DISABLE_COMMON@
 without_config ?= @DISABLE_CONFIG@
 without_cman ?= @DISABLE_CMAN@


More information about the cluster-commits mailing list