Enabled support for VOMS & Gridsite

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 4489c06..6109111 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -48,14 +48,11 @@ TEST_INC:=-I${cppunit}/include
 SUFFIXES = .T 
 
 DEBUG:=-g -O0 -Wall
-# not yet
-#      -I${voms}/include \
-#      -I${gacl}/include \
-#      -I/usr/include/libxml2 \
-
-# -DNO_VOMS -DNO_GACL to be removed when voms/gridsite are available
-CFLAGS:= -DNO_VOMS -DNO_GACL \
-       ${WS_CFLAGS} ${DEBUG} \
+
+GRIDSITE_CFLAGS = `xml2-config --cflags`
+GRIDSITE_LIBS = -lgridsite `xml2-config --libs`
+
+CFLAGS:= ${WS_CFLAGS} ${DEBUG} \
        -DVERSION=\"${version}\" \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
        -I${expat_prefix}/include \
@@ -64,10 +61,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 +87,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