From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8714 invoked by alias); 9 Jul 2009 09:27:04 -0000 Received: (qmail 8702 invoked by alias); 9 Jul 2009 09:27:04 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - build: drop dependency on readline To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: a375c372ab5342fb60d4ea067ae8791a3188d6ff X-Git-Newrev: 3da1f7f4ffc11c95cb492500f1fc9d01d745cf8d From: "Fabio M. Di Nitto" Message-Id: <20090709092634.61E5612030D@lists.fedorahosted.org> Date: Thu, 09 Jul 2009 09:27: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: 2009-q3/txt/msg00029.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3da1f7f4ffc11c95cb492500f1fc9d01d745cf8d Commit: 3da1f7f4ffc11c95cb492500f1fc9d01d745cf8d Parent: a375c372ab5342fb60d4ea067ae8791a3188d6ff Author: Fabio M. Di Nitto AuthorDate: Thu Jul 9 11:26:05 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Thu Jul 9 11:26:05 2009 +0200 build: drop dependency on readline the last user has gone away... Signed-off-by: Fabio M. Di Nitto --- configure | 14 -------------- make/defines.mk.input | 2 -- rgmanager/src/daemons/Makefile | 3 +-- 3 files changed, 1 insertions(+), 18 deletions(-) diff --git a/configure b/configure index da3c862..765bff7 100755 --- a/configure +++ b/configure @@ -51,8 +51,6 @@ my %options = ( ncurseslibdir => \$ncurseslibdir, slangincdir => \$slangincdir, slanglibdir => \$slanglibdir, - readlineincdir => \$readlineincdir, - readlinelibdir => \$readlinelibdir, corosyncincdir => \$corosyncincdir, corosynclibdir => \$corosynclibdir, openaisincdir => \$openaisincdir, @@ -139,8 +137,6 @@ my $err = &GetOptions (\%options, 'ncurseslibdir=s', 'slangincdir=s', 'slanglibdir=s', - 'readlineincdir=s', - 'readlinelibdir=s', 'corosyncincdir=s', 'corosynclibdir=s', 'openaisincdir=s', @@ -250,8 +246,6 @@ if ($help || !$err) { print "--ncurseslibdir=\tthe base directory for ncurses libraries. (Default: {libdir})\n"; print "--slangincdir=\tthe base directory for S-Lang include files. (Default: {incdir})\n"; 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"; @@ -484,12 +478,6 @@ if (!$logtincdir) { if (!$logtlibdir) { $logtlibdir="${objdir}/common/liblogthread"; } -if (!$readlineincdir) { - $readlineincdir="${incdir}"; -} -if (!$readlinelibdir) { - $readlinelibdir="${libdir}"; -} if (!$ncursesincdir) { $ncursesincdir="${incdir}"; } @@ -733,8 +721,6 @@ while () { $_ =~ s/\@FENCELIBDIR\@/$fencelibdir/; $_ =~ s/\@LOGTINCDIR\@/$logtincdir/; $_ =~ s/\@LOGTLIBDIR\@/$logtlibdir/; - $_ =~ s/\@READLINEINCDIR\@/$readlineincdir/; - $_ =~ s/\@READLINELIBDIR\@/$readlinelibdir/; $_ =~ s/\@NCURSESINCDIR\@/$ncursesincdir/; $_ =~ s/\@NCURSESLIBDIR\@/$ncurseslibdir/; $_ =~ s/\@SLANGINCDIR\@/$slangincdir/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 52e9b88..f6c3c82 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -47,8 +47,6 @@ fenceincdir ?= @FENCEINCDIR@ fencelibdir ?= @FENCELIBDIR@ logtincdir ?= @LOGTINCDIR@ logtlibdir ?= @LOGTLIBDIR@ -readlineincdir ?= @READLINEINCDIR@ -readlinelibdir ?= @READLINELIBDIR@ ncursesincdir ?= @NCURSESINCDIR@ ncurseslibdir ?= @NCURSESLIBDIR@ slangincdir ?= @SLANGINCDIR@ diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile index 71bbdf7..de36971 100644 --- a/rgmanager/src/daemons/Makefile +++ b/rgmanager/src/daemons/Makefile @@ -43,7 +43,7 @@ OBJS2= test-noccs.o \ CFLAGS += -DSHAREDIR=\"${sharedir}\" CFLAGS += -fPIC CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir} -CFLAGS += `xml2-config --cflags` -I${readlineincdir} -I${slangincdir} +CFLAGS += `xml2-config --cflags` -I${slangincdir} CFLAGS += -I$(S)/../../include CFLAGS += -I${incdir} @@ -59,7 +59,6 @@ DLM_LDFLAGS += -L${dlmlibdir} -ldlm XML2_LDFLAGS += `xml2-config --libs` SLANG_LDFLAGS += -L${slanglibdir} -lslang EXTRA_LDFLAGS += -lpthread -READLINE_LDFLAGS += -L${readlinelibdir} -lreadline LDDEPS += ../clulib/libclulib.a