From 54d87942872674eee13ae218b37d0bf9a164ebb5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Sun, 13 Mar 2011 18:26:51 +0000
Subject: [PATCH] Left some nodes disabled by default, added new nodes, update
 usage message.

---
 org.glite.lb/configure | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index f1cc493..136cfc2 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -52,9 +52,11 @@ my (%projects, %project);
 my $debug = 0;
 my $pkg_config_env = (defined $ENV{PKG_CONFIG_PATH}) ? "$ENV{PKG_CONFIG_PATH}:" : '';
 
-my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester glite-LB glite-PX/;
+my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester lb px proxyrenewal/;
+my @default_nodes = qw/lb px proxyrenewal/;
 my %enable_nodes;
 my %disable_nodes;
+my %default_nodes; @default_nodes{@default_nodes} = (1) x ($#default_nodes + 1);
 
 # key:      internal package name (arguments, ...)
 # 'pkg':    pkg-config name
@@ -289,11 +291,11 @@ die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},{
 
 if ($dis) {
 	for (@nodes) {
-		$enable_nodes{$_} = 1 unless $disable_nodes{$_};
+		$enable_nodes{$_} = 1 unless ($disable_nodes{$_} or not $default_nodes{$_});
 	}
 }
 
-if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
+if (!$en && !$dis) { for (@nodes) { $enable_nodes{$_} = 1 if ($default_nodes{$_}) } };
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
@@ -662,6 +664,9 @@ for my $ext (keys %deps_aux) {
 	jpprimary => 'jp.primary',
 	jpindex => 'jp.index',
 	jpclient => 'jp.client',
+	lb => 'lb.glite-LB',
+	px => 'px.glite-PX',
+	proxyrenewal => 'px.proxyrenewal'
 );
 
 %obsoletes = (
@@ -1229,15 +1234,15 @@ sub getlibdir {
 
 sub usage {
 	my @ext = keys %externs;
-	my @myjars, keys %jar;
+	my @myjars = keys %jar;
 
 	print STDERR qq{
-usage: $0 options
+Usage: $0 options
 
 General options (defaults in []):
   --prefix=PREFIX		destination directory [./stage]
   --stage=DIR			staging directory [./stage]
-  --root=DIR			installation root (custom relocation root -> sysroot) []
+  --root=DIR			installation root (custom relocation root -> sysroot) [./stage]
   --sysroot=DIR			system root (custom relocation root -> sysroot) []
   --sysconfdir=DIR              system configuration directory [PREFIX/etc]
   --staged=module,module,...	what is already in PREFIX (specify without org.glite.)
@@ -1254,22 +1259,29 @@ Mode of operation:
   --mode=\{checkout|build|etics\}	what to do [build]
   
 What to build:
-  --module=module		build this module only (mostly in-Etics operation)
-  --enable-NODE			build this "node" (set of modules) only. Available nodes are
-					@{$lbmodules{lb}}
+  --module=module		build this module only
+  --enable-NODE			build this "node" (set of modules) only
   --disable-NODE		don't build this node
   --lb-tag=tag			checkout LB modules with specific tag
   --jp-tag=tag			checkout JP modules with specific tag
   --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
   --jobid-tag=tag		checkout jobid modules with specific tag
 
-Dependencies:
-  --with-EXTERNAL=PATH		where to look for an external. Required externals
- 				(not all for all modules) are:
-					@ext
-  --with-JAR=JAR		where to look for jars. Required jars are:
-					@myjars
-				Summary of what will be used is always printed
+Dependencies (summary of what will be used is always printed):
+  --with-EXTERNAL=PATH		where to look for an external [autodetect]
+  --with-JAR=JAR		where to look for jars
+
+Available nodes:
+    @nodes
+
+Default nodes:
+    @default_nodes
+
+Externals (not all for all modules) are:
+    @ext
+
+External jars are:
+    @myjars
 
 };
 
-- 
1.8.2.3