[Cluster-devel] cluster ./configure gnbd/client/Makefile gnbd/ ...

[Cluster-devel] cluster ./configure gnbd/client/Makefile gnbd/ ...

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-07-20 15:11:19

Modified files:
	.              : configure 
	gnbd/client    : Makefile 
	gnbd/server    : Makefile 
	gnbd/tools/gnbd_export: Makefile 
	gnbd/tools/gnbd_import: Makefile 

Log message:
	use cmanincdir when building gnbd

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- cluster/configure	2006/07/19 17:13:48	1.17
+++ cluster/configure	2006/07/20 15:11:16	1.18
@@ -28,7 +28,7 @@
 (cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2)
 
 echo "configure gnbd"
-(cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src) 
+(cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src --cmanincdir=`pwd`/../cman/lib)
 
 echo "configure rgmanager"
 (cd rgmanager; ./configure $@) 
--- cluster/gnbd/client/Makefile	2006/05/16 19:08:17	1.7
+++ cluster/gnbd/client/Makefile	2006/07/20 15:11:16	1.8
@@ -33,7 +33,7 @@
 		echo '-I${KERNEL_SRC}/include'; fi)
 endif
 
-LDLIBS+= -L${libdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
+LDLIBS+= -L${libdir} -L${cmanincdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
 
 CFLAGS+= -O2 -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 
--- cluster/gnbd/server/Makefile	2006/05/16 19:08:17	1.7
+++ cluster/gnbd/server/Makefile	2006/07/20 15:11:17	1.8
@@ -19,7 +19,7 @@
 CLU_SOURCE= gnbd_clusterd.c $(top_srcdir)/utils/gnbd_utils.c \
 	$(top_srcdir)/utils/member_cman.c $(top_srcdir)/utils/group.c
 
-LDLIBS+= -L${libdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
+LDLIBS+= -L${libdir} -L${cmanincdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
 
 SRV_SOURCE= gnbd_serv.c local_req.c extern_req.c device.c gserv.c fence.c \
 	$(top_srcdir)/utils/trans.c $(top_srcdir)/utils/gnbd_utils.c
--- cluster/gnbd/tools/gnbd_export/Makefile	2006/06/26 17:29:31	1.9
+++ cluster/gnbd/tools/gnbd_export/Makefile	2006/07/20 15:11:19	1.10
@@ -20,9 +20,9 @@
 
 INCLUDE= -I$(top_srcdir)/include -I$(top_srcdir)/server \
 	-I$(top_srcdir)/utils -I${top_srcdir}/config \
-	-I${gnbdkincdir} -I${incdir}
+	-I${gnbdkincdir} -I${incdir} -I${cmanincdir}
 
-LDLIBS+= -L${libdir} -lcman -ldl -lpthread
+LDLIBS+= -L${libdir} -L${cmanincdir} -lcman -ldl -lpthread
 
 include ${top_srcdir}/make/defines.mk
 
--- cluster/gnbd/tools/gnbd_import/Makefile	2006/05/16 19:08:18	1.6
+++ cluster/gnbd/tools/gnbd_import/Makefile	2006/07/20 15:11:19	1.7
@@ -21,9 +21,9 @@
 
 INCLUDE= -I$(top_srcdir)/include -I$(top_srcdir)/client \
 	-I$(top_srcdir)/server -I$(top_srcdir)/utils \
-	-I${gnbdkincdir} -I${top_srcdir}/config
+	-I${gnbdkincdir} -I${top_srcdir}/config -I${cmanincdir}
 
-LDLIBS+= -L${libdir} -lcman -ldl -lpthread
+LDLIBS+= -L${libdir} -L${cmanincdir} -lcman -ldl -lpthread
 
 ifneq (${KERNEL_SRC}, )
 # Use the kernel tree if patched, otherwise, look where cluster headers