Correct default for GLITE_LOCATION_VAR.

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 100d2aa..013e164 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -17,6 +17,7 @@ thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 ares_prefix=/opt/ares
 gsoap_prefix=/opt/gsoap
+classads_prefix=/opt/classads
 
 -include Makefile.inc
 
@@ -61,6 +62,7 @@ CFLAGS:= \
        -I${expat_prefix}/include \
        -I${ares_prefix}/include \
        -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
+       -I${classads_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \
@@ -117,9 +119,14 @@ endif
 #      -lvomsc${vomsflavour} \
 #      ${GLOBUS_LIBS}
 
+ifneq (${classads_prefix},/usr)
+       classadslib := -L${classads_prefix}/lib -lclassad
+endif
+
 EXT_LIBS:=  \
        ${mysqlib} -lmysqlclient -lz\
        ${GRIDSITE_LIBS} \
+       ${classadslib} \
        -lvomsc${vomsflavour}
 
 SRVBONES_LIB:= -L${stagedir}/lib -lglite_lb_server_bones

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 10b1a6d..61e9604 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
+GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/var/glite}
 
 [ -f /etc/glite.conf ] && . /etc/glite.conf
 [ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf

diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml
index f533759..2ee3aec 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.8  2005/09/19 15:24:20  akrenek
+       "The gigantic merge"; from release 1.4 branch to HEAD
+       
        Revision 1.7.2.1  2005/08/09 15:02:10  jskrabal
        - build with broken gsoap 2.7.0 repository package
        
@@ -92,6 +95,7 @@ mysql_version=${ext.mysql.version}
 cppunit=${with.cppunit.prefix}
 gsoap_prefix=${with.gsoap.prefix}
 gsoap_version=${ext.gsoap.version}
+classads_prefix=${with.classads.prefix}
                        </echo>
            </target>
        </project>