treat voms, lcas, and gridsite as externals

diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile
index 078a201..da7e0af 100644 (file)
--- a/org.glite.jobid.api-java/Makefile
+++ b/org.glite.jobid.api-java/Makefile
@@ -5,3 +5,5 @@ install:
        mkdir -p ${PREFIX}/share/java
        cp dist/jobid-api-java.jar ${PREFIX}/share/java
 
+clean:
+       echo TODO

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 1468564..bab9069 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -15,8 +15,9 @@ expat_prefix=/opt/expat
 cares_prefix=/opt/c-ares
 gsoap_prefix=/opt/gsoap
 classads_prefix=/opt/classads
-voms_prefix=/opt/voms
-lcas_prefix=/opt/lcas
+voms_prefix=/opt/glite
+lcas_prefix=/opt/glite
+gridsite_prefix=/opt/glite
 
 -include Makefile.inc
 -include ../project/version.properties
@@ -62,8 +63,10 @@ SUFFIXES = .T
 
 DEBUG:=-g -O0 -Wall
 
-GRIDSITE_CFLAGS = `xml2-config --cflags`
-GRIDSITE_LIBS = -lgridsite_globus `xml2-config --libs`
+GRIDSITE_CFLAGS = -I${gridsite_prefix}/include `xml2-config --cflags`
+GRIDSITE_LIBS = -L${gridsite_prefix}/lib -lgridsite_globus `xml2-config --libs`
+
+LCAS_CFLAGS=-I${lcas_prefix}/include
 
 CFLAGS:= \
        ${WS_CFLAGS} ${DEBUG} \
@@ -76,7 +79,7 @@ CFLAGS:= \
        -I${classads_prefix}/include -I${classads_prefix}/include/classad \
        -I${voms_prefix}/include \
        ${COVERAGE_FLAGS} \
-       $(GRIDSITE_CFLAGS) \
+       $(GRIDSITE_CFLAGS) ${LCAS_CFLAGS}\
        -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -DLB_EVENTS_BLOB \
        -I${globus_prefix}/include/${nothrflavour} #gridsite needs this
 
@@ -136,8 +139,8 @@ endif
 ifeq (${nothrflavour},gcc32dbg)
        vomsflavour :=
 endif
-VOMS_LIBS:=-L${voms_prefix}/lib -lvomsapi${vomsflavour}
-LCAS_LIBS:=-L${lcas_prefix}/lib -llcas
+VOMS_LIBS:=-L${voms_prefix}/${archlib} -lvomsapi${vomsflavour}
+LCAS_LIBS:=-L${lcas_prefix}/${archlib} -llcas
 
 #EXT_LIBS:= \
 #      ${expatlib} -lexpat \

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 0289930..0d37d32 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -22,7 +22,10 @@ my %extern_prefix = (
        expat => '/usr',
        globus => '/opt/globus',
        gsoap => '/usr',
-       mysql => '/usr'
+       mysql => '/usr',
+       voms => '/opt/glite',
+       gridsite => '/opt/glite',
+       lcas => '/opt/glite',
 );
 
 
@@ -186,7 +189,7 @@ BEGIN{
        'lb.common' => [ qw/expat cppunit classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit/ ],
-       'lb.server' => [ qw/globus expat cares mysql cppunit gsoap classads/ ],
+       'lb.server' => [ qw/globus expat cares mysql cppunit gsoap classads voms lcas gridsite/ ],
        'lb.state-machine' => [ qw/classads/ ],
        'lb.utils' => [ qw/cppunit/ ],
        'lb.ws-interface' => [],
@@ -232,8 +235,7 @@ BEGIN{
                lb.ws-interface lb.logger lb.types lb.common lb.state-machine
                lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir
                jobid.api-c
-               security.gsoap-plugin security.lcas security.voms
-               gridsite
+               security.gsoap-plugin
        / ],
        'lb.state-machine' => [ qw/lb.common jp.common security.gss/ ],
        'lb.utils' => [ qw/
@@ -257,6 +259,7 @@ BEGIN{
        'jp.common' => [ qw/lbjp-common.db/ ],
 );
 
+#unused
 %extrafull = ( gridsite=>'org.gridsite.core');
 
 %extranodmod = ( java => 'client-java' );