From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Tue, 18 Jan 2005 13:31:46 +0000 (+0000)
Subject: Enabled support for VOMS & Gridsite
X-Git-Tag: glite-deployment-lb_R_1_0_1~15
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=42e530109f7242a7687873cd23214c82b6742d8d;p=jra1mw.git

Enabled support for VOMS & Gridsite
---

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 4489c06..95ac976 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -51,10 +51,17 @@ DEBUG:=-g -O0 -Wall
 # not yet
 #	-I${voms}/include \
 #	-I${gacl}/include \
-#	-I/usr/include/libxml2 \
+#	-I/usr/include/libxml2
+
+GRIDSITE_CFLAGS = `xml2-config --cflags` \
+		  -I${gridsite_prefix}/include \
+		  -I${globus_prefix}/include/${nothrflavour}
+GRIDSITE_LIBS = -lgridsite `xml2-config --libs`
 
 # -DNO_VOMS -DNO_GACL to be removed when voms/gridsite are available
-CFLAGS:= -DNO_VOMS -DNO_GACL \
+#CFLAGS:= -DNO_VOMS -DNO_GACL 
+
+CFLAGS:= \
 	${WS_CFLAGS} ${DEBUG} \
 	-DVERSION=\"${version}\" \
 	-I${stagedir}/include -I${top_srcdir}/src -I. \
@@ -64,10 +71,9 @@ CFLAGS:= -DNO_VOMS -DNO_GACL \
 	${COVERAGE_FLAGS} \
 	-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
 	-I${globus_prefix}/include/${nothrflavour} \
-	-I${gridsite_prefix}/include -I${globus_prefix}/include/${nothrflavour}/openssl \
+	$(GRIDSITE_CFLAGS) \
 	-D_GNU_SOURCE
 
-
 TEST_LIBS:=-L${cppunit}/lib -lcppunit
 TEST_INC:=-I${cppunit}/include
 
@@ -91,6 +97,8 @@ endif
 EXT_LIBS:= -L${ares_prefix}/lib -lares \
 	${myslqlib} -lmysqlclient -lz\
 	${expatlib} -lexpat \
+	${GRIDSITE_LIBS} \
+	-lvomsc \
 	${GLOBUS_LIBS}
 
 GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap