build with trustmanager 2.5 (+ util-java)

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 0d1b60c..890b4d2 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -15,7 +15,7 @@ all compile: genevents genws compile-java build-jar build-c
 
 compile-java:
        ${JAVAC} \
-               -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \
+               -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:${utiljava_prefix}/share/java/glite-security-util-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \
                -d build \
                src/org/glite/lb/*.java \
                build/gen/*.java \

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 6158a8e..9c8a8ce 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -47,6 +47,7 @@ my %extern_prefix = (
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
        trustmanager => '/opt/glite',
+       utiljava => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
@@ -300,7 +301,7 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager utiljava/ ],
        'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
        'lb.doc' => [],
        'lb.logger' => [ qw/cppunit:B/ ],
@@ -533,6 +534,7 @@ BEGIN{
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
                trustmanager=>'org.glite.security.trustmanager',
+               utiljava=>'org.glite.security.util-java',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],