handle correctly gridsite_prefix and voms_prefix

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 95ac976..6989608 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -17,9 +17,10 @@ thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 ares_prefix=/opt/ares
 gsoap_prefix=/opt/gsoap
+gridsite_prefix=/opt/gridsite
+voms_prefix=/opt/voms
 
 -include Makefile.inc
--include ../Makefile.inc
 
 GLITE_LB_SERVER_WITH_WS=yes
 
@@ -53,10 +54,8 @@ DEBUG:=-g -O0 -Wall
 #      -I${gacl}/include \
 #      -I/usr/include/libxml2
 
-GRIDSITE_CFLAGS = `xml2-config --cflags` \
-                 -I${gridsite_prefix}/include \
-                 -I${globus_prefix}/include/${nothrflavour}
-GRIDSITE_LIBS = -lgridsite `xml2-config --libs`
+GRIDSITE_CFLAGS = -I${gridsite_prefix}/include `xml2-config --cflags`
+GRIDSITE_LIBS = -L${gridsite_prefix}/lib -lgridsite `xml2-config --libs`
 
 # -DNO_VOMS -DNO_GACL to be removed when voms/gridsite are available
 #CFLAGS:= -DNO_VOMS -DNO_GACL 
@@ -72,6 +71,7 @@ CFLAGS:= \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \
        $(GRIDSITE_CFLAGS) \
+       -I${voms_prefix}/include \
        -D_GNU_SOURCE
 
 TEST_LIBS:=-L${cppunit}/lib -lcppunit
@@ -98,7 +98,7 @@ EXT_LIBS:= -L${ares_prefix}/lib -lares \
        ${myslqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
        ${GRIDSITE_LIBS} \
-       -lvomsc \
+       -L${voms_prefix}/lib -lvomsc \
        ${GLOBUS_LIBS}
 
 GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap

diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml
index cbf186d..7e569f7 100644 (file)
--- a/org.glite.lb.server/project/configure.properties.xml
+++ b/org.glite.lb.server/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.4  2004/10/15 11:03:03  jskrabal
+       - merge fixes
+       
        Revision 1.3  2004/10/06 08:14:36  dkouril
        Support for VOMS and GACL (gridsite) from SCM CVS
        - legacy names of GACL routines changed to new ones, which also prevents from
@@ -73,6 +76,7 @@ mysql_prefix=${with.mysql.prefix}
 cppunit=${with.cppunit.prefix}
 gridsite_prefix=${with.gridsite.prefix}
 gsoap_prefix=${with.gsoap.prefix}
+voms_prefix=${with.voms.prefix}
                        </echo>
            </target>
        </project>