From 62a742ee2720d184903b6227020a1aae4e37c2ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Fri, 22 Jan 2010 13:49:00 +0000 Subject: [PATCH] The most recent version copied. Do not modify this instance (RW in ./org.glite.lb). --- org.glite.lb.harvester/configure | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/org.glite.lb.harvester/configure b/org.glite.lb.harvester/configure index 35b621c..565574d 100755 --- a/org.glite.lb.harvester/configure +++ b/org.glite.lb.harvester/configure @@ -28,7 +28,7 @@ my $sec_tag = ''; my $jobid_tag = ''; my $libdir = 'lib'; -my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient harvester/; +my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; my %enable_nodes; my %disable_nodes; @@ -38,7 +38,6 @@ my %extern_prefix = ( cppunit => '/usr', expat => '/usr', globus => '/opt/globus', - jglobus => '/opt/globus', gsoap => '/usr', mysql => '/usr', 'mysql-devel' => '', @@ -72,9 +71,9 @@ 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 harvester/], 'security' => [qw/gss gsoap-plugin/], - 'lbjp-common' => [qw/db maildir server-bones trio jp-interface/], + '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/ ], ); @@ -300,10 +299,10 @@ BEGIN{ %need_externs_aux = ( 'lb.client' => [ qw/cppunit:B classads/ ], 'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ], - 'lb.common' => [ qw/expat cares:B cppunit:B classads/ ], + '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:R mysql-server:R mysql-devel:B 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:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite log4c/ ], 'lb.state-machine' => [ qw/classads/ ], 'lb.utils' => [ qw/cppunit:B/ ], 'lb.ws-interface' => [], @@ -311,6 +310,7 @@ BEGIN{ 'lb.types' => [ qw// ], 'lb.harvester' => [ qw/postgresql:R/ ], '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/ ], @@ -367,13 +367,14 @@ 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 / ], @@ -393,7 +394,7 @@ for my $jar (keys %need_jars) { / ], 'lbjp-common.db' => [ qw/lbjp-common.trio/ ], 'lbjp-common.maildir' => [ qw// ], - 'lbjp-common.server-bones' => [ qw// ], + 'lbjp-common.server-bones' => [ qw/lbjp-common.log/ ], 'lbjp-common.trio' => [ qw// ], 'security.gss' => [ qw// ], 'security.gsoap-plugin' => [ qw/security.gss/ ], @@ -448,7 +449,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); } @@ -466,7 +467,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 lb.harvester 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); -- 1.8.2.3