From b64b47e3433dc0c2a017e01d6ca347b31de90204 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 18 Feb 2011 18:31:18 +0000
Subject: [PATCH] New package layout for MyProxy.

---
 org.glite.lb/configure | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 3258454..8b63779 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -50,6 +50,9 @@ my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db
 my %enable_nodes;
 my %disable_nodes;
 
+# key:      internal package name (arguments, ...)
+# 'pkg':    pkg-config name
+# 'prefix': used when pkg-config fails
 my %externs = (
 	cares => {
 		prefix => '/opt/c-ares',
@@ -71,15 +74,18 @@ my %externs = (
 		prefix=> '/opt/globus',
 		pkg => 'globus-gssapi-gsi'
 	},
-	'myproxy-essentials' => {
+	'myproxy-devel' => {
 		prefix=> '/opt/globus',
 		pkg => 'myproxy'
 	},
 	'myproxy-server' => {
-		prefix=> '/opt/globus',
+		prefix=> '',
 	},
-	'myproxy-client' => {
-		prefix=> '/opt/globus',
+	'myproxy-libs' => {
+		prefix=> '',
+	},
+	'myproxy-admin' => {
+		prefix=> '',
 	},
 	gsoap => {
 		prefix=> '/usr',
@@ -446,10 +452,10 @@ BEGIN{
         'jp.server-common' => [],
         'jp.ws-interface' => [],
 	'gridsite.core' => [qw/httpd-devel:B gsoap:B globus:B/ ],
-	'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-essentials voms/ ],
+	'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B myproxy-libs:R voms/ ],
 	'px.glite-PX' => [qw/myproxy-server:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/],
 	'px.myproxy-yaim' => [ qw/yaim_core:R/ ],
-	'px.myproxy-config' => [ qw/myproxy-client:R/ ], # in myproxy-config.spec
+	'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
 );
 
 for my $ext (keys %need_externs_aux) {
@@ -707,9 +713,10 @@ BEGIN{
 	%etics_externs = (
 		globus_essentials=>'vdt_globus_essentials',
 		globus=>'globus',
-		'myproxy-essentials'=>'myproxy_essentials',
-		'myproxy-server'=>'myproxy_server',
-		'myproxy-client'=>'myproxy_client',
+		'myproxy-devel'=>'myproxy-devel',
+		'myproxy-libs'=>'myproxy-libs',
+		'myproxy-server'=>'myproxy-server',
+		'myproxy-admin'=>'myproxy-admin',
 		cares=>'c-ares',
 		voms=>'org.glite.security.voms-api-cpp',
 		gridsite=>'org.gridsite.shared',
@@ -736,8 +743,8 @@ BEGIN{
 		yaim_core=>'emi.yaim.yaim-core'
 	);
 	%etics_projects = (
-		vdt=>[qw/globus globus_essentials myproxy/],
-		'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
+		vdt=>[qw/globus globus_essentials gpt/],
+		'org.glite'=>[qw/voms gridsite lcas gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
 	);
 	%etics_projects_emi = (
 		vdt=>'externs',
-- 
1.8.2.3