From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6306 invoked by alias); 12 Aug 2008 11:34:17 -0000 Received: (qmail 6295 invoked by alias); 12 Aug 2008 11:34:15 -0000 X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - build: add support for corosync To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 72ffa95c03dd531d2ed6e7cbc1ed89dddf0bf8ec X-Git-Newrev: 674aea11d7fdddc382d01839f631b17385916f38 From: "Fabio M. Di Nitto" Message-Id: <20080812113312.65F8F12002B@lists.fedorahosted.org> Date: Tue, 12 Aug 2008 13:33:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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-q3/txt/msg00242.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=674aea11d7fdddc382d01839f631b17385916f38 Commit: 674aea11d7fdddc382d01839f631b17385916f38 Parent: 72ffa95c03dd531d2ed6e7cbc1ed89dddf0bf8ec Author: Fabio M. Di Nitto AuthorDate: Tue Aug 12 13:31:47 2008 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue Aug 12 13:31:47 2008 +0200 build: add support for corosync rename aisexecbin to corosyncbin add options for corosyncincdir and corosynclibdir and propagate them across all Makefile Signed-off-by: Fabio M. Di Nitto --- ccs/daemon/Makefile | 4 ++-- cman/cman_tool/Makefile | 2 +- cman/daemon/Makefile | 2 +- cman/qdisk/Makefile | 4 ++-- config/libs/libccsconfdb/Makefile | 4 ++-- config/tools/ldap/Makefile | 4 ++-- configure | 26 ++++++++++++++++++++------ fence/agents/xvm/Makefile | 8 +++++--- fence/fence_node/Makefile | 4 ++-- fence/fenced/Makefile | 4 ++-- group/daemon/Makefile | 4 ++-- group/dlm_controld/Makefile | 7 ++++--- group/gfs_controld/Makefile | 7 ++++--- make/defines.mk.input | 4 +++- 14 files changed, 52 insertions(+), 32 deletions(-) diff --git a/ccs/daemon/Makefile b/ccs/daemon/Makefile index 50726df..ade527e 100644 --- a/ccs/daemon/Makefile +++ b/ccs/daemon/Makefile @@ -17,12 +17,12 @@ OBJS= ccsd.o \ globals.o CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -CFLAGS += -I${cmanincdir} `xml2-config --cflags` -I${openaisincdir} +CFLAGS += -I${cmanincdir} `xml2-config --cflags` -I${corosyncincdir} CFLAGS += -I$(S) -I$(S)/../include -I$(S)/../common CFLAGS += -I${incdir} LDFLAGS += -L${cmanlibdir} -lcman -LDFLAGS += -L${openaislibdir} -llogsys +LDFLAGS += -L${corosynclibdir} -llogsys LDFLAGS += `xml2-config --libs` -lpthread LDFLAGS += -L${libdir} diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile index 9bdc38c..0dee578 100644 --- a/cman/cman_tool/Makefile +++ b/cman/cman_tool/Makefile @@ -13,7 +13,7 @@ include $(OBJDIR)/make/uninstall.mk OBJS= main.o \ join.o -CFLAGS += -DCOROSYNCBIN=\"${aisexecbin}\" +CFLAGS += -DCOROSYNCBIN=\"${corosyncbin}\" CFLAGS += -I${cmanincdir} CFLAGS += -I${incdir} diff --git a/cman/daemon/Makefile b/cman/daemon/Makefile index e8c8d02..f97c56f 100644 --- a/cman/daemon/Makefile +++ b/cman/daemon/Makefile @@ -12,7 +12,7 @@ include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk CFLAGS += -fPIC -CFLAGS += -I${openaisincdir} +CFLAGS += -I${openaisincdir} -I${corosyncincdir} CFLAGS += -I${incdir} LDFLAGS += -L${libdir} diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile index 5625d58..8c90001 100644 --- a/cman/qdisk/Makefile +++ b/cman/qdisk/Makefile @@ -13,11 +13,11 @@ include $(OBJDIR)/make/uninstall.mk CFLAGS += -D_GNU_SOURCE CFLAGS += -Werror -Wstrict-prototypes -Wshadow -CFLAGS += -I${ccsincdir} -I${cmanincdir} -L${openaisincdir} +CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${corosyncincdir} CFLAGS += -I$(S) CFLAGS += -I${incdir} -LDFLAGS += -L${openaislibdir} -llogsys -lpthread +LDFLAGS += -L${corosynclibdir} -llogsys -lpthread LDFLAGS += -L${libdir} EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs diff --git a/config/libs/libccsconfdb/Makefile b/config/libs/libccsconfdb/Makefile index 0ba3034..a0d6056 100644 --- a/config/libs/libccsconfdb/Makefile +++ b/config/libs/libccsconfdb/Makefile @@ -11,9 +11,9 @@ include $(OBJDIR)/make/uninstall.mk CFLAGS += -fPIC CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -CFLAGS += -I${openaisincdir} `xml2-config --cflags` +CFLAGS += -I${corosyncincdir} `xml2-config --cflags` CFLAGS += -I${incdir} -LDFLAGS += -L${openaislibdir} -lconfdb +LDFLAGS += -L${corosynclibdir} -lconfdb LDFLAGS += `xml2-config --libs` LDFLAGS += -L${libdir} diff --git a/config/tools/ldap/Makefile b/config/tools/ldap/Makefile index 79e2032..5c6b2d6 100644 --- a/config/tools/ldap/Makefile +++ b/config/tools/ldap/Makefile @@ -13,10 +13,10 @@ include $(OBJDIR)/make/uninstall.mk OBJS= confdb2ldif.o CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -CFLAGS += -I${openaisincdir} +CFLAGS += -I${corosyncincdir} CFLAGS += -I${incdir} -LDFLAGS += -L${openaislibdir} -lconfdb +LDFLAGS += -L${corosynclibdir} -lconfdb LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} diff --git a/configure b/configure index af97344..bb4f61e 100755 --- a/configure +++ b/configure @@ -52,9 +52,11 @@ my %options = ( slanglibdir => \$slanglibdir, readlineincdir => \$readlineincdir, readlinelibdir => \$readlinelibdir, + corosyncincdir => \$corosyncincdir, + corosynclibdir => \$corosynclibdir, openaisincdir => \$openaisincdir, openaislibdir => \$openaislibdir, - aisexecbin => \$aisexecbin, + corosyncbin => \$corosyncbin, virtincdir => \$virtincdir, virtlibdir => \$virtlibdir, nssincdir => \$nssincdir, @@ -136,9 +138,11 @@ my $err = &GetOptions (\%options, 'slanglibdir=s', 'readlineincdir=s', 'readlinelibdir=s', + 'corosyncincdir=s', + 'corosynclibdir=s', 'openaisincdir=s', 'openaislibdir=s', - 'aisexecbin=s', + 'corosyncbin=s', 'virtincdir=s', 'virtlibdir=s', 'nssincdir=s', @@ -243,9 +247,11 @@ if ($help || !$err) { print "--slanglibdir=\tthe base directory for S-Lang libraries. (Default: {libdir})\n"; print "--readlineincdir=\tthe base directory for readline include files. (Default: {incdir})\n"; print "--readlinelibdir=\tthe base directory for readline libraries. (Default: {libdir})\n"; + print "--corosyncincdir=\tthe base directory for corosync include files. (Default: {incdir})\n"; + print "--corosynclibdir=\tthe base directory for corosync libraries. (Default: {libdir}/corosync)\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 "--aisexecbin=\tlocation of aisexec executable file. (Default: /usr/sbin/corosync)\n"; + print "--corosyncbin=\tlocation of corosync executable file. (Default: /usr/sbin/corosync)\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"; print "--nsprincdir=\tthe base directory for libnspr include files. (Default: {incdir}/nspr4)\n"; @@ -487,14 +493,20 @@ if (!$slangincdir) { if (!$slanglibdir) { $slanglibdir="${libdir}"; } +if (!$corosyncincdir) { + $corosyncincdir="${incdir}"; +} +if (!$corosynclibdir) { + $corosynclibdir="${libdir}/corosync"; +} if (!$openaisincdir) { $openaisincdir="${incdir}"; } if (!$openaislibdir) { $openaislibdir="${libdir}/openais"; } -if (!$aisexecbin) { - $aisexecbin="/usr/sbin/corosync"; +if (!$corosyncbin) { + $corosyncbin="/usr/sbin/corosync"; } if (!$nssincdir) { $nssincdir="${incdir}/nss3"; @@ -703,9 +715,11 @@ while () { $_ =~ s/\@NCURSESLIBDIR\@/$ncurseslibdir/; $_ =~ s/\@SLANGINCDIR\@/$slangincdir/; $_ =~ s/\@SLANGLIBDIR\@/$slanglibdir/; + $_ =~ s/\@COROSYNCINCDIR\@/$corosyncincdir/; + $_ =~ s/\@COROSYNCLIBDIR\@/$corosynclibdir/; $_ =~ s/\@OPENAISINCDIR\@/$openaisincdir/; $_ =~ s/\@OPENAISLIBDIR\@/$openaislibdir/; - $_ =~ s/\@AISEXECBIN\@/$aisexecbin/; + $_ =~ s/\@COROSYNCBIN\@/$corosyncbin/; $_ =~ s/\@XENINCDIR\@/$xenincdir/; $_ =~ s/\@XENLIBDIR\@/$xenlibdir/; $_ =~ s/\@LDAPINCDIR\@/$ldapincdir/; diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile index 9fd6513..9f638ef 100644 --- a/fence/agents/xvm/Makefile +++ b/fence/agents/xvm/Makefile @@ -31,7 +31,8 @@ SHAREDOBJS= mcast.o \ CFLAGS += -D_GNU_SOURCE CFLAGS += -Werror -Wstrict-prototypes -Wshadow -CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir} +CFLAGS += -I${ccsincdir} -I${cmanincdir} +CFLAGS += -I${corosyncincdir} -I${openaisincdir} CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir} CFLAGS += `xml2-config --cflags` CFLAGS += -I${incdir} @@ -39,11 +40,12 @@ CFLAGS += -I${incdir} EXTRA_CFLAGS += -DSTANDALONE LDFLAGS += -L${nsslibdir} -lnss3 -LDFLAGS += -L${openaislibdir} -llogsys +LDFLAGS += -L${corosynclibdir} -llogsys LDFLAGS += -L${libdir} EXTRA_LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman -EXTRA_LDFLAGS += -L${virtlibdir} -lvirt -lSaCkpt +EXTRA_LDFLAGS += -L${virtlibdir} -lvirt +EXTRA_LDFLAGS += -L${openaislibdir} -lSaCkpt XML_LDFLAGS += `xml2-config --libs` ${TARGET1}: ${SHAREDOBJS} ${OBJS1} diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile index 47a1d42..9c707ed 100644 --- a/fence/fence_node/Makefile +++ b/fence/fence_node/Makefile @@ -14,12 +14,12 @@ OBJS= fence_node.o CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -I${ccsincdir} -I${fenceincdir} -I${openaisincdir} +CFLAGS += -I${ccsincdir} -I${fenceincdir} -I${corosyncincdir} CFLAGS += -I$(S)/../libfenced CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -L${fencelibdir} -lccs -lfence -LDFLAGS += -L${openaislibdir} -llogsys +LDFLAGS += -L${corosynclibdir} -llogsys LDFLAGS += -L../libfenced -lfenced LDFLAGS += -L${libdir} diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile index 684afb5..97c602b 100644 --- a/fence/fenced/Makefile +++ b/fence/fenced/Makefile @@ -19,13 +19,13 @@ OBJS= config.o \ logging.o CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${openaisincdir} +CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${corosyncincdir} CFLAGS += -I$(S) -I$(S)/../include -I$(S)/../libfenced -I$(SRCDIR)/group/lib CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman LDFLAGS += -L${fencelibdir} -lfence -LDFLAGS += -L${openaislibdir} -lcpg -llogsys -lpthread +LDFLAGS += -L${corosynclibdir} -lcpg -llogsys -lpthread LDFLAGS += -L../../group/lib -l group LDFLAGS += -L${libdir} diff --git a/group/daemon/Makefile b/group/daemon/Makefile index 5d0a96e..d5dad51 100644 --- a/group/daemon/Makefile +++ b/group/daemon/Makefile @@ -17,13 +17,13 @@ OBJS= app.o \ main.o \ logging.o -CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir} +CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${corosyncincdir} CFLAGS += -I$(S) -I$(S)/../include/ -I$(S)/../lib/ CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -lccs LDFLAGS += -L${cmanlibdir} -lcman -LDFLAGS += -L${openaislibdir} -lcpg -llogsys -lpthread +LDFLAGS += -L${corosynclibdir} -lcpg -llogsys -lpthread LDFLAGS += -L${libdir} ${TARGET}: ${OBJS} diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile index c4d5e10..7742633 100644 --- a/group/dlm_controld/Makefile +++ b/group/dlm_controld/Makefile @@ -23,15 +23,16 @@ OBJS= action.o \ logging.o CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${dlmcontrolincdir} -CFLAGS += -I${openaisincdir} +CFLAGS += -I${corosyncincdir} -I${openaisincdir} CFLAGS += -I$(SRCDIR)/fence/libfenced/ CFLAGS += -I${KERNEL_SRC}/include/ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/ CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman -LDFLAGS += -L${dlmlibdir} -ldlm -LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread +LDFLAGS += -L${dlmlibdir} -ldlm +LDFLAGS += -L${corosynclibdir} -lcpg -llogsys -lpthread +LDFLAGS += -L${openaislibdir} -lSaCkpt LDFLAGS += -L../../fence/libfenced/ -lfenced LDFLAGS += -L../lib -lgroup LDFLAGS += -L${libdir} diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile index 6c898c4..02da248 100644 --- a/group/gfs_controld/Makefile +++ b/group/gfs_controld/Makefile @@ -21,8 +21,8 @@ OBJS= main.o \ plock.o \ logging.o -CFLAGS += -I${ccsincdir} -I${cmanincdir} -CFLAGS += -I${dlmcontrolincdir} -I${openaisincdir} +CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmcontrolincdir} +CFLAGS += -I${corosyncincdir} -I${openaisincdir} CFLAGS += -I${KERNEL_SRC}/include/ CFLAGS += -I$(S)/../libgfscontrol -I$(S)/../../fence/libfenced/ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/ @@ -30,7 +30,8 @@ CFLAGS += -I${incdir} LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol -LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread +LDFLAGS += -L${corosynclibdir} -lcpg -llogsys -lpthread +LDFLAGS += -L${openaislibdir} -lSaCkpt LDFLAGS += -L../../fence/libfenced/ -lfenced LDFLAGS += -L../lib -lgroup LDFLAGS += -L${libdir} diff --git a/make/defines.mk.input b/make/defines.mk.input index 0a457f1..353f338 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -54,9 +54,11 @@ nssincdir ?= @NSSINCDIR@ nsslibdir ?= @NSSLIBDIR@ nsprincdir ?= @NSPRINCDIR@ nsprlibdir ?= @NSPRLIBDIR@ +corosyncincdir ?= @COROSYNCINCDIR@ +corosynclibdir ?= @COROSYNCLIBDIR@ openaisincdir ?= @OPENAISINCDIR@ openaislibdir ?= @OPENAISLIBDIR@ -aisexecbin ?= @AISEXECBIN@ +corosyncbin ?= @COROSYNCBIN@ xenincdir ?= @XENINCDIR@ xenlibdir ?= @XENLIBDIR@ ldapincdir ?= @LDAPINCDIR@