From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Mon, 3 Jan 2011 14:51:37 +0000 (+0000)
Subject: The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
X-Git-Tag: glite-px-glite-PX_R_3_2_0_2~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=be1272cbdb26e0ceb5c1c24ce05e0c019c906e80;p=jra1mw.git

The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
---

diff --git a/org.glite.px.glite-PX/configure b/org.glite.px.glite-PX/configure
index b81f8e0..119b64f 100755
--- a/org.glite.px.glite-PX/configure
+++ b/org.glite.px.glite-PX/configure
@@ -44,33 +44,93 @@ my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
 my $libdir = getlibdir();
+my $projectname;
+
 
 my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient harvester/;
 my %enable_nodes;
 my %disable_nodes;
 
-my %extern_prefix = (
-	cares => '/opt/c-ares',
-	classads => '/opt/classads',
-	cppunit => '/usr',
-	expat => '/usr',
-	globus => '/opt/globus',
-	myproxy => '/opt/myproxy',
-	gsoap => '/usr',
-	mysql => '/usr',
-	'mysql-devel' => '',
-	'mysql-server' => '',
-	voms => '/opt/glite',
-	gridsite => '/opt/glite',
-	lcas => '/opt/glite',
-	trustmanager => '/opt/glite',
-	utiljava => '/opt/glite',
-	ant => '/usr',
-	jdk => '/usr',
-	libtar => '/usr',
-	axis => '/usr',
-	log4c => '/usr',
-	postgresql => '/usr'
+my %externs = (
+	cares => {
+		prefix => '/opt/c-ares',
+		pkg => 'libcares'
+	},
+	classads => {
+		prefix=> '/usr',
+		pkg => 'classads'
+	},
+	cppunit => {
+		prefix=> '/usr',
+		pkg => 'cppunit'
+	},
+	expat => {
+		prefix=> '/usr',
+		pkg => 'expat'
+	},
+	globus => {
+		prefix=> '/opt/globus',
+		pkg => 'globus-gssapi-gsi'
+	},
+	'myproxy-essentials' => {
+		prefix=> '/opt/globus',
+		pkg => 'myproxy'
+	},
+	'myproxy-server' => {
+		prefix=> '/opt/globus',
+		pkg => 'myproxy-server'
+	},
+	'myproxy-client' => {
+		prefix=> '/opt/globus',
+		pkg => 'myproxy-client'
+	},
+	gsoap => {
+		prefix=> '/usr',
+		pkg => 'gsoap'
+	},
+	mysql => {
+		prefix=> '/usr'
+	},
+	'mysql-devel' => {
+		prefix=> ''
+	},
+	'mysql-server' => {
+		prefix => ''
+	},
+	voms => {
+		prefix => '/opt/glite',
+		pkg => 'voms-1.0'
+	},
+	gridsite => {
+		prefix => '/opt/glite'
+	},
+	lcas => {
+		prefix => '/opt/glite'
+	},
+	trustmanager => {
+		prefix => '/opt/glite'
+	},
+	utiljava => {
+		prefix=> '/opt/glite'
+	},
+	ant => {
+		prefix=> '/usr'
+	},
+	jdk => {
+		prefix=> '/usr'
+	},
+	libtar => {
+		prefix=> '/usr'
+	},
+	axis => {
+		prefix=> '/usr'
+	},
+	log4c => {
+		prefix=> '/usr'
+	},
+	postgresql => {
+		prefix=> '/usr'
+	}
 );
 
 my %jar = (
@@ -88,15 +148,16 @@ my %extranodmod;
 my %deps;
 my %deps_type;
 my %buildroot;
+my (%etics_externs, %etics_projects, %etics_projects_emi, %etics_externs_emi);
 
 my %lbmodules = (
 	'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim glite-LB/], 
 	'security' => [qw/gss gsoap-plugin/],
-	'lbjp-common' => [qw/db log maildir server-bones trio jp-interface/],
+	'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin/],
 	'jobid' => [qw/api-c api-cpp api-java/],
 	'jp' => [ qw/client doc index primary server-common ws-interface/ ],
 	'gridsite' => [ qw/apache shared commands core/ ],
-	'px' => [ qw/proxyrenewal glite-PX myproxy-yaim/ ],
+	'px' => [ qw/proxyrenewal glite-PX myproxy-yaim myproxy-config/ ],
 	);
 
 
@@ -104,8 +165,8 @@ my @opts = (
 	'prefix=s' => \$prefix,
 	'staged=s' => \$staged,
 	'module=s' => \$module,
-	'thrflavour=s' => \$thrflavour,
-	'nothrflavour=s' => \$nothrflavour,
+	'thrflavour:s' => \$thrflavour,
+	'nothrflavour:s' => \$nothrflavour,
 	'mode=s' => \$mode,
 	'listmodules=s' => \$listmodules,
 	'version=s' => \$version,
@@ -130,20 +191,26 @@ for (@nodes) {
 	push @opts,"enable-$_",\$enable_nodes{$_};
 }
 
-push @opts,"with-$_=s",\$extern_prefix{$_} for keys %extern_prefix;
+push @opts,"with-$_=s",\$externs{$_}{withprefix} for keys %externs;
 push @opts,"with-$_=s",\$jar{$_} for keys %jar;
 
 my @keeparg = @ARGV;
 
 GetOptions @opts or die "Errors parsing command line\n";
 
-$extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
-$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
+$externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq '';
+$externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq '';
+$projectname = $emi ? 'emi' : 'org.glite';
+if ($emi) {
+	for $_ (keys %etics_externs_emi) {
+		$etics_externs{$_} = $etics_externs_emi{$_};
+	}
+}
 
 if ($help) { usage(); exit 0; }
 
 if ($listmodules) {
-	my @m = map "org.glite.$listmodules.$_",@{$lbmodules{$listmodules}};
+	my @m = map "$projectname.$listmodules.$_",@{$lbmodules{$listmodules}};
 	print "@m\n";
 	exit 0;
 }
@@ -165,6 +232,32 @@ die "--module cannot be used with --enable-* or --disable-*\n"
 
 die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},@{$lbmodules{security}},{$lbmodules{jp}};
 
+if ($mode eq 'build') { for my $ext (keys %externs) {
+	if (defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; }
+	elsif (defined $externs{$ext}{pkg}) {
+		my ($prefix, $flag);
+		my $pkg = $externs{$ext}{pkg};
+		my $flagname = uc $externs{$ext}{pkg};
+		$flagname =~ s/-[0-9\.]*$//;
+		$flagname =~ s/-/_/g;
+
+		print "Checking $pkg ... ";
+		`pkg-config "$pkg" --exists >/dev/null`;
+		if ($? == 0) {
+			$externs{$ext}{prefix}=`pkg-config $pkg --variable=prefix`;
+			chomp $externs{$ext}{prefix};
+			print "$externs{$ext}{prefix}\n";
+
+			$flag=`pkg-config $pkg --cflags`;
+			$externs{$ext}{flags} .= "${flagname}_CFLAGS=$flag" if ($flag);
+			$flag=`pkg-config $pkg --libs`;
+			$externs{$ext}{flags} .= "${flagname}_LIBS=$flag" if ($flag);
+		} else {
+			print "(using default $externs{$ext}{prefix})\n";
+		}
+	}
+} }
+
 if ($dis) {
 	for (@nodes) {
 		$enable_nodes{$_} = 1 unless $disable_nodes{$_};
@@ -180,7 +273,7 @@ $stagedir = $prefix unless $stagedir;
 if ($mode eq 'build') {
 	print "Writing config.status\n";
 	open CONF,">config.status" or die "config.status: $!\n";
-	print CONF "$0 @keeparg\n";
+	print CONF "PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} $0 @keeparg\n";
 	close CONF;
 }
 
@@ -226,8 +319,9 @@ sub mode_build {
 	@myjars = keys %aux;
 	
 	print "\nRequired externals:\n";
-	print "\t$_: $extern_prefix{$_}\n" for @ext;
+	print "\t$_: $externs{$_}{prefix}\n" for @ext;
 	print "\t$_: $jar{$_}\n" for @myjars;
+	for (@ext) { if (defined($externs{$_}{flags})) { print "$externs{$_}{flags}"; } };
 	print "\nThis is a poor-man configure, it's up to you to have sources and externals there\n\n";
 	
 	mkinc($_) for @modules;
@@ -339,6 +433,8 @@ BEGIN{
 	'lbjp-common.server-bones' => [ qw// ],
 	'lbjp-common.trio' => [ qw/cppunit:B/ ],
 	'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B/ ],
+	'lbjp-common.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
+	'lbjp-common.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
 	'security.gss' =>  [ qw/globus_essentials:R globus:B cares cppunit:B/ ],
 	'security.gsoap-plugin' =>  [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap:B/ ],
 	'jobid.api-c' =>  [ qw/cppunit:B/ ],
@@ -351,9 +447,10 @@ BEGIN{
         'jp.server-common' => [],
         'jp.ws-interface' => [],
 	'gridsite.core' => [qw/httpd-devel:B gsoap:B globus:B/ ],
-	'px.proxyrenewal' => [ qw/globus:B myproxy voms/ ],
-	'px.glite-PX' => [qw/myproxy:R/],
+	'px.proxyrenewal' => [ qw/globus:B myproxy_essentials voms/ ],
+	'px.glite-PX' => [qw/myproxy_server:R fetchcrl:R gip_service:R bdii:R glite_version:R/],
 	'px.myproxy-yaim' => [ qw/yaim_core:R/ ],
+	'px.myproxy-config' => [ qw/myproxy_client:R/ ],
 );
 
 for my $ext (keys %need_externs_aux) {
@@ -381,7 +478,7 @@ for my $jar (keys %need_jars) {
 		lb.types:B lb.common
 		lbjp-common.trio
 		jobid.api-cpp:B jobid.api-c
-		security.gss
+		lbjp-common.gss
 	/ ],
 	'lb.client-java' => [ qw/
 		lb.types:B
@@ -390,7 +487,7 @@ for my $jar (keys %need_jars) {
 	/ ],
 	'lb.common' => [ qw/
 		jobid.api-cpp:B jobid.api-c
-		lb.types:B lbjp-common.trio security.gss
+		lb.types:B lbjp-common.trio lbjp-common.gss
 	/ ],
 	'lb.doc' => [ qw/lb.types:B/ ],
 	'lb.logger' => [ qw/
@@ -398,27 +495,27 @@ for my $jar (keys %need_jars) {
 		lbjp-common.log
 		jobid.api-c
 		lb.common
-		security.gss
+		lbjp-common.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.log
 		jobid.api-c
-		security.gsoap-plugin security.gss
+		lbjp-common.gsoap-plugin lbjp-common.gss
 	/ ],
-	'lb.state-machine' => [ qw/lb.types:B lb.common lbjp-common.jp-interface security.gss/ ],
+	'lb.state-machine' => [ qw/lb.types:B lb.common lbjp-common.jp-interface lbjp-common.gss/ ],
 	'lb.utils' => [ qw/
 		lbjp-common.jp-interface
 		jobid.api-c
 		lbjp-common.trio lbjp-common.maildir
 		lb.client lb.state-machine
 	/ ],
-	'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
+	'lb.ws-test' => [ qw/lbjp-common.gsoap-plugin lb.ws-interface/ ],
 	'lb.ws-interface' => [ qw/lb.types:B/ ],
 	'lb.types' => [ qw// ],
 	'lb.harvester' => [ qw/
 		jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
-		security.gss lbjp-common.log
+		lbjp-common.gss lbjp-common.log
 	/ ],
 	'lb.yaim' => [ qw// ],
 	'lb.glite-LB' => [ qw/
@@ -430,6 +527,8 @@ for my $jar (keys %need_jars) {
 	'lbjp-common.log' => [ qw// ],
 	'lbjp-common.server-bones' => [ qw/lbjp-common.log/ ],
 	'lbjp-common.trio' => [ qw// ],
+	'lbjp-common.gss' =>  [ qw// ],
+	'lbjp-common.gsoap-plugin' =>  [ qw/lbjp-common.gss/ ],
 	'security.gss' =>  [ qw// ],
 	'security.gsoap-plugin' =>  [ qw/security.gss/ ],
 	'jobid.api-c' =>  [ qw// ],
@@ -442,20 +541,20 @@ for my $jar (keys %need_jars) {
                 jp.ws-interface
                 lbjp-common.jp-interface lbjp-common.maildir
                 jobid.api-c
-                security.gsoap-plugin
+                lbjp-common.gsoap-plugin
         / ],
 	'jp.doc' => [ qw// ],
 	'jp.index' => [ qw/
                 jp.server-common jp.ws-interface
                 lbjp-common.jp-interface lbjp-common.trio lbjp-common.db lbjp-common.server-bones
-                security.gsoap-plugin
+                lbjp-common.gsoap-plugin
         / ],
 	'jp.primary' => [ qw/
                 jobid.api-c
                 jp.server-common jp.ws-interface
                 lb.state-machine
                 lbjp-common.jp-interface lbjp-common.trio lbjp-common.db lbjp-common.server-bones
-                security.gsoap-plugin
+                lbjp-common.gsoap-plugin
         / ],
 	'jp.server-common' => [ qw/ 
                 lbjp-common.jp-interface lbjp-common.db
@@ -465,8 +564,9 @@ for my $jar (keys %need_jars) {
 	'gridsite.core' => [ qw/build.common-cpp:B/ ],
 
 	'px.proxyrenewal' => [ qw// ],
-	'px.glite-PX' => [qw/px.myproxy-yaim:R/],
-	'px.myproxy-yaim' => [],
+	'px.glite-PX' => [qw/px.myproxy-yaim:R px.myproxy-config:R/],
+	'px.myproxy-yaim' => [ qw/px.myproxy-config:R/ ],
+	'px.myproxy-config' => [],
 );
 
 for my $ext (keys %deps_aux) {
@@ -493,6 +593,9 @@ for my $ext (keys %deps_aux) {
 	'lb.yaim' => [ qq/glite-yaim-lb/ ],
 	'px.proxyrenewal' => [ qq/glite-security-proxyrenewal/ ],
 	'px.myproxy-yaim' => [ qq/glite-yaim-myproxy/ ],
+	'px.myproxy-config' => [ qq/myproxy-config/ ],
+	'lbjp-common.gss' => [ qq/glite-security-gss/ ],
+	'lbjp-common.gsoap-plugin' => [ qq/glite-security-gsoap-plugin/ ],
 );
 
 %cvs_prefix = (
@@ -548,9 +651,9 @@ 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 lb.yaim lb.glite-LB
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
-lbjp-common.db lbjp-common.log 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 lbjp-common.gss lbjp-common.gsoap-plugin
 jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface
-px.proxyrenewal px.myproxy-yaim px.glite-PX
+px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config
 /;
 	@aux{@m} = (1) x ($#m+1);
 
@@ -587,7 +690,8 @@ libdir = $libdir
 };
 
 	for (@{$need_externs{$short}}) {
-		print MKINC "${_}_prefix = $extern_prefix{$_}\n"
+		print MKINC "${_}_prefix = $externs{$_}{prefix}\n";
+		print MKINC "$externs{$_}{flags}" if defined $externs{$_}{flags};
 	}
 
 	for (@{$need_jars{$short}}) {
@@ -602,13 +706,13 @@ libdir = $libdir
 	close MKINC;
 }
 
-my %etics_externs;
-my %etics_projects;
 BEGIN{
 	%etics_externs = (
 		globus_essentials=>'vdt_globus_essentials',
 		globus=>'globus',
-		myproxy=>'myproxy',
+		myproxy_essentials=>'myproxy-essentials',
+		myproxy_server=>'myproxy-server',
+		myproxy_client=>'myproxy-client',
 		cares=>'c-ares',
 		voms=>'org.glite.security.voms-api-cpp',
 		gridsite=>'org.gridsite.shared',
@@ -625,10 +729,20 @@ BEGIN{
 		glue_schema=>'glue-schema',
 		yaim_core=>'org.glite.yaim.core',
 	);
+	%etics_externs_emi = (
+		globus_essentials=>'globus-gssapi-gsi',
+		globus=>'globus-gssapi-gsi-devel',
+		gridsite=>'emi.gridsite.shared',
+		yaim_core=>'emi.yaim.yaim-core'
+	);
 	%etics_projects = (
-		vdt=>[qw/globus globus_essentials myproxy/],
+		vdt=>[qw/globus globus_essentials myproxy_server myproxy_client myproxy_essentials/],
 		'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
 	);
+	%etics_projects_emi = (
+		vdt=>'externs',
+		'org.glite'=>'emi',
+	);
 
 	%platform_properties = (
 		'gridsite.core' => {
@@ -676,24 +790,32 @@ sub mode_etics {
 	for (@{$need_externs{"$subsys.$module"}}) {
 	    if ($need_externs_type{"$subsys.$module"}->{$_}=~/B/) {
 		my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_;
-		push @copts,$ge{$_} ? "--with-$_=\${stageDir}" : "--with-$_=\${$eext.location}";
+		if ($emi) {
+			if ($ge{$_} and not defined $externs{$_}{pkg}) {
+				push @copts, "--with-$_=\${stageDir}";
+			}
+		} else {
+			push @copts,$ge{$_} ? "--with-$_=\${stageDir}" : "--with-$_=\${$eext.location}";
+		}
 	    }
 	}
 
 	for (@{$need_jars{"$subsys.$module"}}) {
 		my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_;
 
-		push @copts,"--with-$_ \${$eext.location}$jar{$_}";
+		push @copts,"--with-$_ \${$eext.location}$jar{$_}" if (not $emi);
 	}
 
 	my $conf;
 	my $conftag;
-	my $confprefix;
+	my ($confprefix, $nameprefix);
 
 	$dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n";
 
-	if ($emi) { $confprefix = $emi_conf_prefix{$subsys} }
-	else { $confprefix = $conf_prefix{$subsys} }
+	$confprefix = $emi ? $emi_conf_prefix{$subsys} : $conf_prefix{$subsys};
+	$nameprefix = $confprefix;
+	$nameprefix =~ s/-$//;
+	$nameprefix =~ s/-/\./g;
 
 	if ($branch) {
 		$conf = "$confprefix${subsys}-${module}_$branch"; 
@@ -748,7 +870,13 @@ sub mode_etics {
 
 	if ($subsys eq 'gridsite') {
 		if ($module eq 'core') {
-			my $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"';
+			my $flags;
+
+			if ($emi) {
+				$flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=`pkg-config gsoap --variable=prefix` OPENSSL_GLOBUS_FLAGS=`pkg-config globus-openssl --cflags` OPENSSL_GLOBUS_LIBS=`pkg-config globus-openssl --libs` FLAVOR_GLOBUS_EXT= HTTPD_FLAGS="-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-${aprSuffix} -I/usr/include/pcre"';
+			} else {
+				$flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"';
+			}
 
 			$cmd{compile} = "make $flags build";
 			$cmd{install} = "make $flags install";
@@ -758,8 +886,15 @@ sub mode_etics {
 			$cmd{packaging} = "echo building nothing, org.gridsite.core make rpm step will create this";
 		}
 	}
+	elsif ($subsys eq 'px') {
+		if ($module eq 'myproxy-config') {
+			$cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts";
+			$cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config";
+		}
+	}
 	else {
-		$cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts";
+		my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}";
+		$cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts";
 		$cmd{compile} = 'make';
 		$cmd{test} = 'make check';
 		$cmd{install} = 'make install';
@@ -771,23 +906,20 @@ sub mode_etics {
 		$defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n";
 	}
 
-	my $checkoutcmd;
-	if ($conftag eq 'HEAD') {
-		$checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}";
-	} else {
-		$checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}";
-	}
+	my $checkoutcmd = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module";
+	$checkoutcmd .= "; ln -s \${moduleName} $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null || true" if ($emi);
 
 	print STDERR "Writing $file\n";
 	print C qq{
 [Configuration-$conf]
 profile = None
-moduleName = $cvs_prefix{$subsys}.$subsys.$module
+moduleName = $projectname.$subsys.$module
 displayName = $conf
 description = $cvs_prefix{$subsys}.$subsys.$module
-projectName = org.glite
+projectName = $projectname
 age = $age
 deploymentType = None
+vcsroot = :pserver:anonymous\@glite.cvs.cern.ch:/cvs/glite
 tag = $conftag
 version = $major.$minor.$rev
 $dwpath
@@ -849,6 +981,9 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS
 
 		my $proj = 'externals';
 		for my $p (keys %etics_projects) {
+			if ($emi and defined $etics_projects_emi{$p}) {
+				$p = $etics_projects_emi{$p};
+			}
 			for $m (@{$etics_projects{$p}}) {
 				$proj = $p if $m eq $_;
 			}
@@ -860,7 +995,7 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS
 
 	for (@{$deps{"$subsys.$module"}}) {
 		my $type = $deps_type{"$subsys.$module"}->{$_};
-		print C "org.glite|org.glite.$_ = $type\n";
+		print C "$projectname|$projectname.$_ = $type\n";
 	}
 
 	close C;
@@ -869,12 +1004,13 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS
 sub gsoap_version {
 	local $_;
 	my $gsoap_version;
-	open S,"$extern_prefix{gsoap}/bin/soapcpp2 -v 2>&1 |" or die "$extern_prefix{gsoap}/bin/soapcpp2: $!\n";
+	open S,"$externs{gsoap}{prefix}/bin/soapcpp2 -v 2>&1 |" or die "$externs{gsoap}{prefix}/bin/soapcpp2: $!\n";
 
 	while ($_ = <S>) {
 		chomp;
 
 		$gsoap_version = $1 if /The gSOAP Stub and Skeleton Compiler for C and C\+\+ ([.[:digit:][:alpha:]]+)$/;
+		$gsoap_version = $1 if /The gSOAP code generator for C and C\+\+, soapcpp2 release ([.[:digit:][:alpha:]]+)$/;
 	}
 	close S;
 	return $gsoap_version;
@@ -931,7 +1067,7 @@ sub getlibdir {
 }
 
 sub usage {
-	my @ext = keys %extern_prefix;
+	my @ext = keys %externs;
 	my @myjars, keys %jar;
 
 	print STDERR qq{