From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 28 Nov 2012 13:37:00 +0000 (+0000)
Subject: Return back EMI dependencies to EMI-3 etics configurations (==> just removing externa... 
X-Git-Tag: gridsite-core_R_1_7_25~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bc5515680de5ecdd5936343605343bd7de73a20a;p=jra1mw.git

Return back EMI dependencies to EMI-3 etics configurations (==> just removing external dependencies for EMI >= 3).
---

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index b1a1d31..848c2be 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -1940,47 +1940,47 @@ $package_description$package_summary$defprops};
 		my $used = 0;
 		my $output = '';
 
-		# build dependencies needed only for EMI <= 2
-		if ($project ne 'emi' or $project_version <= 2) {
-			for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
-				my $eext = $etics_externs{$platform}{$_};
-				my $edev = $project{etics_externs_devel}{$platform}{$_};
-
-				# for the default platform using package of the same
-				# name for runtime dependency
-				if (not $eext) {
-					if ($platform eq 'default') {
+		for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
+			my $eext = $etics_externs{$platform}{$_};
+			my $edev = $project{etics_externs_devel}{$platform}{$_};
+
+			# for the default platform using package of the same
+			# name for runtime dependency
+			if (not $eext) {
+				if ($platform eq 'default') {
 #print "default runtime $_ on default\n";
-						$eext = $_; }
-					else {
+					$eext = $_; }
+				else {
 #print "no runtime $_ on $platform\n";
-						$eext = '-'; }
-				}
-				if ($eext eq '-' and $edev eq '-') {
+					$eext = '-'; }
+			}
+			if ($eext eq '-' and $edev eq '-') {
 #print "skipping $_ on $platform\n";
-					next;
-				}
+				next;
+			}
 
-				my $proj = 'externals';
-				for my $p (keys %etics_projects) {
-					for $m (@{$etics_projects{$p}}) {
-						$proj = $p if $m eq $_;
-					}
+			my $proj = 'externals';
+			for my $p (keys %etics_projects) {
+				for $m (@{$etics_projects{$p}}) {
+					$proj = $p if $m eq $_;
 				}
+			}
+
+			# external dependencies only for EMI <= 2
+			if ($proj eq 'externals' and $project eq 'emi' and $project_version >= 3) { next; }
 
-				my $type = $need_externs_type{"$subsys.$module"}->{$_};
+			my $type = $need_externs_type{"$subsys.$module"}->{$_};
 
-				if ($edev) {
-					if ($type eq 'B') {
-						# no runtime - change to devel pkg
-						$eext = $edev;
-					} elsif ($type eq 'BR' or $type eq 'RB') {
-						# additional devel pkg
-						if ($edev ne '-') { $output .= "$proj|$edev = B\n"; }
-					}
+			if ($edev) {
+				if ($type eq 'B') {
+					# no runtime - change to devel pkg
+					$eext = $edev;
+				} elsif ($type eq 'BR' or $type eq 'RB') {
+					# additional devel pkg
+					if ($edev ne '-') { $output .= "$proj|$edev = B\n"; }
 				}
-				if ($eext ne '-') { $output .= "$proj|$eext = $type\n"; }
 			}
+			if ($eext ne '-') { $output .= "$proj|$eext = $type\n"; }
 		}
 
 		if ($platform eq 'default') {