FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 12-06-2007, 11:53 PM
 
Default cluster ./configure make/defines.mk.input rgma ...

CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh@sourceware.org 2007-12-07 00:53:44

Modified files:
. : configure
make : defines.mk.input
rgmanager/src/daemons: Makefile slang_event.c

Log message:
Make S-Lang library & include paths configurable.

NOTE: You MUST rerun configure after applying this
update or rgmanager will no longer build.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.39&r2=1.40
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/defines.mk.input.diff?cvsroot=cluster&r1=1.7&r2=1. 8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/slang_event.c.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- cluster/configure 2007/12/06 10:38:00 1.39
+++ cluster/configure 2007/12/07 00:53:44 1.40
@@ -53,6 +53,8 @@
volidlibdir => $volidlibdir,
ncursesincdir => $ncursesincdir,
ncurseslibdir => $ncurseslibdir,
+ slangincdir => $slangincdir,
+ slanglibdir => $slanglibdir,
readlineincdir => $readlineincdir,
readlinelibdir => $readlinelibdir,
openaisincdir => $openaisincdir,
@@ -110,6 +112,8 @@
'volidlibdir=s',
'ncursesincdir=s',
'ncurseslibdir=s',
+ 'slangincdir=s',
+ 'slanglibdir=s',
'readlineincdir=s',
'readlinelibdir=s',
'openaisincdir=s',
@@ -182,6 +186,8 @@
print "--volidlibdir= the base directory for volume_id libraries. (Default: {libdir})
";
print "--ncursesincdir= the base directory for ncurses include files. (Default: {incdir})
";
print "--ncurseslibdir= the base directory for ncurses libraries. (Default: {libdir})
";
+ print "--slangincdir= the base directory for S-Lang include files. (Default: {incdir})
";
+ print "--slanglibdir= the base directory for S-Lang libraries. (Default: {libdir})
";
print "--readlineincdir= the base directory for readline include files. (Default: {incdir})
";
print "--readlinelibdir= the base directory for readline libraries. (Default: {libdir})
";
print "--openaisincdir= the base directory for openais include files. (Default: {incdir})
";
@@ -369,6 +375,12 @@
if (!$ncurseslibdir) {
$ncurseslibdir="${libdir}";
}
+if (!$slangincdir) {
+ $slangincdir="${incdir}";
+}
+if (!$slanglibdir) {
+ $slanglibdir="${libdir}";
+}
if (!$openaisincdir) {
$openaisincdir="${incdir}";
}
@@ -507,6 +519,8 @@
$_ =~ s/@READLINELIBDIR@/$readlinelibdir/;
$_ =~ s/@NCURSESINCDIR@/$ncursesincdir/;
$_ =~ s/@NCURSESLIBDIR@/$ncurseslibdir/;
+ $_ =~ s/@SLANGINCDIR@/$slangincdir/;
+ $_ =~ s/@SLANGLIBDIR@/$slanglibdir/;
$_ =~ s/@OPENAISINCDIR@/$openaisincdir/;
$_ =~ s/@OPENAISLIBDIR@/$openaislibdir/;
$_ =~ s/@AISEXECBIN@/$aisexecbin/;
--- cluster/make/defines.mk.input 2007/11/12 08:06:38 1.7
+++ cluster/make/defines.mk.input 2007/12/07 00:53:44 1.8
@@ -48,6 +48,8 @@
readlinelibdir ?= @READLINELIBDIR@
ncursesincdir ?= @NCURSESINCDIR@
ncurseslibdir ?= @NCURSESLIBDIR@
+slangincdir ?= @SLANGINCDIR@
+slanglibdir ?= @SLANGLIBDIR@
nssincdir ?= @NSSINCDIR@
nsslibdir ?= @NSSLIBDIR@
nsprincdir ?= @NSPRINCDIR@
--- cluster/rgmanager/src/daemons/Makefile 2007/11/30 21:36:28 1.25
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/07 00:53:44 1.26
@@ -55,7 +55,7 @@
CFLAGS += -D_GNU_SOURCE -DSHAREDIR="${sharedir}"
CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
-CFLAGS += `xml2-config --cflags` -I${readlineincdir}
+CFLAGS += `xml2-config --cflags` -I${readlineincdir} -I${slangincdir}
CFLAGS += -I../../include
CFLAGS += -I${incdir}

@@ -68,7 +68,8 @@
CMAN_LDFLAGS += -L${cmanlibdir} -lcman
DLM_LDFLAGS += -L${dlmlibdir} -ldlm
XML2_LDFLAGS += `xml2-config --libs`
-EXTRA_LDFLAGS += -lpthread -ldl -lslang
+SLANG_LDFLAGS += -L${slanglibdir} -lslang
+EXTRA_LDFLAGS += -lpthread -ldl
LOCAL_LDFLAGS += -llalloc
READLINE_LDFLAGS += -L${readlinelibdir} -lreadline

@@ -76,7 +77,8 @@

${TARGET1}: ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS)
- $(DLM_LDFLAGS) $(XML2_LDFLAGS) $(EXTRA_LDFLAGS)
+ $(DLM_LDFLAGS) $(XML2_LDFLAGS)
+ $(SLANG_LDFLAGS) $(EXTRA_LDFLAGS)

${TARGET2}: ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
@@ -97,7 +99,8 @@
#
${TARGET3}: ${SHAREDOBJS} ${OBJS3}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS)
- $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
+ $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS)
+ $(SLANG_LDFLAGS)

${TARGET4}: ${SHAREDOBJS} ${OBJS4}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS)
--- cluster/rgmanager/src/daemons/slang_event.c 2007/11/30 21:36:28 1.1
+++ cluster/rgmanager/src/daemons/slang_event.c 2007/12/07 00:53:44 1.2
@@ -30,7 +30,7 @@

#include <stdio.h>
#include <string.h>
-#include <slang/slang.h>
+#include <slang.h>
#include <sys/syslog.h>
#include <malloc.h>
#include <clulog.h>
 

Thread Tools




All times are GMT. The time now is 02:10 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org