From ccd23045ff93dd5f034d9bdfe8238f74111994d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 17 Apr 2011 21:52:10 +0000 Subject: [PATCH] Latest EMI-1 RC4 updates. --- org.glite.lb/configure | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index aace459..10db0e2 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -720,10 +720,6 @@ for my $ext (keys %deps_aux) { ); %conflicts = ( - 'lb.glite-LB' => [ qq/emi-lb/ ], - 'px.glite-PX' => [ qq/emi-px/ ], - 'lb.emi-lb' => [ qq/glite-LB/ ], - 'px.emi-px' => [ qq/glite-PX/ ], ); %cvs_prefix = ( @@ -819,7 +815,6 @@ for my $ext (keys %deps_aux) { gridsite=>'emi.gridsite.shared', yaim_core=>'emi.yaim.yaim-core', yaim_bdii=>'emi.bdii.yaim-bdii', - gip_release=>'emi.bdii.glite-info-provider-release', gip_service=>'emi.bdii.glite-info-provider-service', bdii=>'emi.bdii.core', glite_version=>'emi.misc.glite-version', @@ -849,11 +844,11 @@ for my $ext (keys %deps_aux) { jdk=>'java-devel', }, etics_projects => { - 'emi'=>[qw/voms voms-devel gridsite lcas gip_release gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], + 'emi'=>[qw/voms voms-devel gridsite lcas gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], }, need_externs_aux => { 'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager trustmanager_axis libtool:B/ ], - 'lb.glite-LB' => [ qw/fetchcrl:R gip_release:R gip_service:R bdii:R glite_version:R glue_schema:R/ ], + 'lb.glite-LB' => [ qw/fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R/ ], 'lb.yaim' => [ qw/yaim_core:R yaim_bdii:R perl-LDAP:R/ ], 'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R/], 'px.myproxy-yaim' => [ qw/yaim_core:R yaim_bdii:R/ ], -- 1.8.2.3