From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5267 invoked by alias); 7 Mar 2008 04:28:19 -0000 Received: (qmail 5237 invoked by uid 9702); 7 Mar 2008 04:28:19 -0000 Date: Fri, 07 Mar 2008 04:28:00 -0000 Message-ID: <20080307042819.5222.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.02.00-2-g241d93e X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 3aa78efa2839cc3c00c8f70a3e2bb4c09ddc463c X-Git-Newrev: 241d93efae78a509e8cae5a2300ff2205686a5f9 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00283.txt.bz2 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=241d93efae78a509e8cae5a2300ff2205686a5f9 The branch, STABLE2 has been updated via 241d93efae78a509e8cae5a2300ff2205686a5f9 (commit) from 3aa78efa2839cc3c00c8f70a3e2bb4c09ddc463c (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 241d93efae78a509e8cae5a2300ff2205686a5f9 Author: Fabio M. Di Nitto Date: Fri Mar 7 05:23:32 2008 +0100 [BUILD] Fix build system with openais whitetank Attempt to autodetect if we are building against openais trunk or whitetank release. So far the only way is to detect is to if liblogsys is installed or not. So far none of the openais headers include a version that could be used to #ifdef within the code directly. Allow to force the build against whitetank release by adding --openaiswhitetank configure option. Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: cman/daemon/Makefile | 3 +-- configure | 10 ++++++++++ make/defines.mk.input | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile index ff169e1..0532e9b 100644 --- a/cman/daemon/Makefile +++ b/cman/daemon/Makefile @@ -22,11 +22,10 @@ include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk -CFLAGS += -DOPENAIS_EXTERNAL_SERVICE +CFLAGS += -DOPENAIS_EXTERNAL_SERVICE ${openaiswhitetank} CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${openaisincdir} CFLAGS += -I${incdir} -#CFLAGS += -DOPENAIS_WHITETANK LDFLAGS += -L${ccslibdir} -lccs diff --git a/configure b/configure index fd7825e..be49f7f 100755 --- a/configure +++ b/configure @@ -62,6 +62,7 @@ my %options = ( readlinelibdir => \$readlinelibdir, openaisincdir => \$openaisincdir, openaislibdir => \$openaislibdir, + openaiswhitetank => \$openaiswhitetank, aisexecbin => \$aisexecbin, virtincdir => \$virtincdir, virtlibdir => \$virtlibdir, @@ -127,6 +128,7 @@ my $err = &GetOptions (\%options, 'readlinelibdir=s', 'openaisincdir=s', 'openaislibdir=s', + 'openaiswhitetank', 'aisexecbin=s', 'virtincdir=s', 'virtlibdir=s', @@ -207,6 +209,7 @@ if ($help || !$err) { print "--readlinelibdir=\tthe base directory for readline libraries. (Default: {libdir})\n"; print "--openaisincdir=\tthe base directory for openais include files. (Default: {incdir})\n"; print "--openaislibdir=\tthe base directory for openais libraries. (Default: {libdir}/openais)\n"; + print "--openaiswhitetank\tforce build against openais whitetank releases. (Default: autodetect)\n"; print "--aisexecbin=\tlocation of aisexec executable file. (Default: /usr/sbin/aisexec)\n"; print "--nssincdir=\tthe base directory for libnss include files. (Default: {incdir}/nss3)\n"; print "--nsslibdir=\tthe base directory for libnss libraries. (Default: {libdir})\n"; @@ -446,6 +449,12 @@ if (!$openaisincdir) { if (!$openaislibdir) { $openaislibdir="${libdir}/openais"; } +if (((!$openaiswhitetank) && (! -f "$openaislibdir/liblogsys.a" )) || ($openaiswhitetank)) { + $openaiswhitetank="-DOPENAIS_WHITETANK"; + printf "\nBuilding against OpenAIS Whitetank\n"; +} else { + $openaiswhitetank=""; +} if (!$aisexecbin) { $aisexecbin="/usr/sbin/aisexec"; } @@ -592,6 +601,7 @@ while () { $_ =~ s/\@SLANGLIBDIR\@/$slanglibdir/; $_ =~ s/\@OPENAISINCDIR\@/$openaisincdir/; $_ =~ s/\@OPENAISLIBDIR\@/$openaislibdir/; + $_ =~ s/\@OPENAISWHITETANK\@/$openaiswhitetank/; $_ =~ s/\@AISEXECBIN\@/$aisexecbin/; $_ =~ s/\@XENINCDIR\@/$xenincdir/; $_ =~ s/\@XENLIBDIR\@/$xenlibdir/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 3f3f0e5..f3c732c 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -58,6 +58,7 @@ nsprincdir ?= @NSPRINCDIR@ nsprlibdir ?= @NSPRLIBDIR@ openaisincdir ?= @OPENAISINCDIR@ openaislibdir ?= @OPENAISLIBDIR@ +openaiswhitetank ?= @OPENAISWHITETANK@ aisexecbin ?= @AISEXECBIN@ xenincdir ?= @XENINCDIR@ xenlibdir ?= @XENLIBDIR@ hooks/post-receive -- Cluster Project