From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 18 Nov 2009 12:35:57 +0000 (+0000)
Subject: The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
X-Git-Tag: glite-lbjp-common-trio_R_1_0_1_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=997540733263459b726a7343d92412f14f70729d;p=jra1mw.git

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

diff --git a/org.glite.lbjp-common.trio/configure b/org.glite.lbjp-common.trio/configure
index 455145c..b3a5b00 100755
--- a/org.glite.lbjp-common.trio/configure
+++ b/org.glite.lbjp-common.trio/configure
@@ -26,6 +26,7 @@ my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
 my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
 my %enable_nodes;
@@ -41,6 +42,7 @@ my %extern_prefix = (
 	gsoap => '/usr',
 	mysql => '/usr',
 	'mysql-devel' => '',
+	'mysql-server' => '',
 	voms => '/opt/glite',
 	gridsite => '/opt/glite',
 	lcas => '/opt/glite',
@@ -90,6 +92,7 @@ my @opts = (
 	'security-tag=s' => \$sec_tag,
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
+	'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -108,6 +111,7 @@ 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 '';
 
 if ($help) { usage(); exit 0; }
 
@@ -294,7 +298,7 @@ BEGIN{
 	'lb.common' => [ qw/expat cppunit:B classads/ ],
 	'lb.doc' => [],
 	'lb.logger' => [ qw/cppunit:B/ ],
-	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ],
+	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
 	'lb.state-machine' => [ qw/classads/ ],
 	'lb.utils' => [ qw/cppunit:B/ ],
 	'lb.ws-interface' => [],
@@ -484,6 +488,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
 	for (@{$need_externs{$short}}) {
@@ -605,7 +610,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
+configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -664,6 +669,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir		typically [lib,lib64] postfix
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]