This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=da4f93ba9b 9b1328934fa9ca86c4bd03f0e1bf76

The branch, master has been updated
via da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76 (commit)
from 92865dbbf6effea4102ff69320a4c6ac3923e793 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da4f93ba9b9b1328934fa9ca86c4bd03f0e1bf76
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Wed Jul 16 10:21:04 2008 +0200

[BUILD] Implement --enable_legacy_code in the build system

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
ccs/ccs_tool/Makefile | 6 ++----
configure | 13 +++++++++++++
make/defines.mk.input | 1 +
3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile
index 3cb84e6..f984206 100644
--- a/ccs/ccs_tool/Makefile
+++ b/ccs/ccs_tool/Makefile
@@ -19,13 +19,11 @@ CFLAGS += -I${cmanincdir} `xml2-config --cflags`
CFLAGS += -I${ccslibdir} -I$(S)/../include
CFLAGS += -I$(S)/../libccscompat
CFLAGS += -I${incdir}
-ifdef LEGACY_CODE
-CFLAGS += -DLEGACY_CODE
-endif

LDFLAGS += -L${cmanlibdir} -lcman
LDFLAGS += `xml2-config --libs` -L${libdir}
-ifdef LEGACY_CODE
+
+ifdef legacy_code
LDFLAGS += -L../libccscompat -lccscompat
else
LDFLAGS += -L${ccslibdir} -lccs
diff --git a/configure b/configure
index 707b9b9..ac5ecff 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,7 @@ my %options = (
fence_agents => $fence_agents,
fenceagentslibdir => $fenceagentslibdir,
enable_crack_of_the_day => $enable_crack_of_the_day,
+ enable_legacy_code => $enable_legacy_code,
enable_xen => $enable_xen,
somajor => $somajor,
sominor => $sominor,
@@ -169,6 +170,7 @@ my $err = &GetOptions (\%options,
'fence_agents=s',
'fenceagentslibdir=s',
'enable_crack_of_the_day',
+ 'enable_legacy_code',
'enable_xen',
'without_ccs',
'without_cman',
@@ -258,6 +260,7 @@ if ($help || !$err) {
print " Use --fence_agents=help for a list
";
print "--fenceagentslibdir= specify directory where to install common fence python lib. (Default: /usr/share/fence)
";
print "--enable_crack_of_the_day Enable build of highly experimental features that rely on code that is not yet available for general use. (Default: no)
";
+ print "--enable_legacy_code Enable build of old/obsolete/unsupported code/tools. (Default: no)
";
print "--enable_xen Enable building of Xen-specific pieces
";
print "--without_ccs Disable ccs building (Default: enabled)
";
print "--without_cman Disable cman building (Default: enabled)
";
@@ -574,6 +577,15 @@ if (!$enable_crack_of_the_day) {
print "
************************************************** ******************************************
";
$cflags="${cflags} -DEXPERIMENTAL_BUILD";
}
+if (!$enable_legacy_code) {
+ $enable_legacy_code="";
+} else {
+ print "
************************************************** ******************************************
";
+ print "WARNING: *you* have explicitly enabled the build of old/obsoleted/unsupported code/tools
";
+ print " This code is provided *only* for backward compatibility
";
+ print "
************************************************** ******************************************
";
+ $cflags="${cflags} -DLEGACY_CODE";
+}
if (!$enable_xen) {
$enable_xen="";
}
@@ -715,6 +727,7 @@ while (<IFILE>) {
$_ =~ s/@FENCE_AGENTS@/$fence_agents/;
$_ =~ s/@FENCEAGENTSLIBDIR@/$fenceagentslibdir/;
$_ =~ s/@ENABLE_CRACK_OF_THE_DAY@/$enable_crack_of_the_day/;
+ $_ =~ s/@ENABLE_LEGACY_CODE@/$enable_legacy_code/;
$_ =~ s/@ENABLE_XEN@/$enable_xen/;
$_ =~ s/@DISABLE_CCS@/$without_ccs/;
$_ =~ s/@DISABLE_CMAN@/$without_cman/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index c465e74..f24a82b 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -66,6 +66,7 @@ virtlibdir ?= @VIRTLIBDIR@
fence_agents ?= @FENCE_AGENTS@
fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
+legacy_code ?= @ENABLE_LEGACY_CODE@
enable_xen ?= @ENABLE_XEN@
without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@


hooks/post-receive
--
Cluster Project