From 5fd802eab77bdc05a813a0ae998344a2b88d3557 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Tue, 3 Nov 2009 15:25:17 +0000 Subject: [PATCH] The most recent version copied. Do not modify this instance (RW in ./org.glite.lb). --- org.glite.jobid.api-c/configure | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/org.glite.jobid.api-c/configure b/org.glite.jobid.api-c/configure index 455145c..d1f8c4f 100755 --- a/org.glite.jobid.api-c/configure +++ b/org.glite.jobid.api-c/configure @@ -27,7 +27,7 @@ my $jp_tag = ''; my $sec_tag = ''; my $jobid_tag = ''; -my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/; +my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient/; my %enable_nodes; my %disable_nodes; @@ -37,20 +37,24 @@ my %extern_prefix = ( cppunit => '/usr', expat => '/usr', globus => '/opt/globus', - jglobus => '/opt/globus', gsoap => '/usr', mysql => '/usr', 'mysql-devel' => '', voms => '/opt/glite', gridsite => '/opt/glite', lcas => '/opt/glite', + trustmanager => '/opt/glite', ant => '/usr', jdk => '/usr', libtar => '/usr', + axis => '/usr', + log4c => '/usr', + postgresql => '/usr' ); my %jar = ( - 'commons-codec' => '/usr/share/java/commons-codec-1.3.jar', + 'commons-codec' => '/usr/share/java/commons-codec.jar', + 'commons-lang' => '/usr/share/java/commons-lang.jar', ); @@ -65,10 +69,10 @@ my %deps_type; my %topbuild; my %lbmodules = ( - 'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], + 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test/], 'security' => [qw/gss gsoap-plugin/], - 'lbjp-common' => [qw/db maildir server-bones trio jp-interface/], - 'jobid' => [qw/api-c api-cpp/], + 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface/], + 'jobid' => [qw/api-c api-cpp api-java/], 'jp' => [ qw/client doc index primary server-common ws-interface/ ], ); @@ -290,17 +294,18 @@ sub mode_checkout() { BEGIN{ %need_externs_aux = ( 'lb.client' => [ qw/cppunit:B classads/ ], - 'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ], + 'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ], 'lb.common' => [ qw/expat cppunit:B classads/ ], 'lb.doc' => [], - 'lb.logger' => [ qw/cppunit:B/ ], - 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ], + 'lb.logger' => [ qw/cppunit:B log4c/ ], + 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite log4c/ ], 'lb.state-machine' => [ qw/classads/ ], 'lb.utils' => [ qw/cppunit:B/ ], 'lb.ws-interface' => [], 'lb.ws-test' => [ qw/gsoap:B/ ], 'lb.types' => [ qw// ], - 'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ], + 'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ], + 'lbjp-common.log' => [ qw// ], 'lbjp-common.maildir' => [ qw// ], 'lbjp-common.server-bones' => [ qw// ], 'lbjp-common.trio' => [ qw/cppunit:B/ ], @@ -329,6 +334,7 @@ for my $ext (keys %need_externs_aux) { %need_jars = ( 'jobid.api-java' => [ qw/commons-codec/ ], + 'lb.client-java' => [ qw/commons-lang/ ], ); for my $jar (keys %need_jars) { @@ -346,6 +352,7 @@ for my $jar (keys %need_jars) { / ], 'lb.client-java' => [ qw/ lb.types:B + lb.ws-interface:B jobid.api-java / ], 'lb.common' => [ qw/ @@ -355,17 +362,18 @@ for my $jar (keys %need_jars) { 'lb.doc' => [ qw/lb.types:B/ ], 'lb.logger' => [ qw/ lbjp-common.trio + lbjp-common.log jobid.api-c lb.common security.gss / ], 'lb.server' => [ qw/ lb.ws-interface lb.types:B lb.common lb.state-machine - lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir + lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir lbjp-common.log jobid.api-c security.gsoap-plugin security.gss / ], - 'lb.state-machine' => [ qw/lb.types:B lb.common lbjp-common.jp-interface security.gss/ ], + 'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ], 'lb.utils' => [ qw/ lbjp-common.jp-interface jobid.api-c @@ -432,7 +440,7 @@ for my $ext (keys %deps_aux) { jpclient => 'jp.client', ); -my @t = qw/lb.client-java jobid.api-java lb.types/; +my @t = qw/lb.client-java jobid.api-java lb.types lbjp-common.log/; @topbuild{@t} = (1) x ($#t+1); } @@ -450,7 +458,7 @@ sub mkinc lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java security.gss security.gsoap-plugin jobid.api-c jobid.api-cpp jobid.api-java -lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface +lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface /; @aux{@m} = (1) x ($#m+1); @@ -512,6 +520,7 @@ BEGIN{ voms=>'org.glite.security.voms-api-cpp', gridsite=>'org.gridsite.shared', lcas=>'org.glite.security.lcas', + trustmanager=>'org.glite.security.trustmanager', ); %etics_projects = ( vdt=>[qw/globus globus_essentials/], -- 1.8.2.3