From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 21 Jan 2009 13:42:34 +0000 (+0000)
Subject: The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
X-Git-Tag: glite-lbjp-common-db_R_1_0_0_3~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d8464fbfa458e40773610ebf17b7167e9ad6997e;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.db/configure b/org.glite.lbjp-common.db/configure
index 87d1171..90b22ef 100755
--- a/org.glite.lbjp-common.db/configure
+++ b/org.glite.lbjp-common.db/configure
@@ -11,6 +11,7 @@ use Getopt::Long;
 
 my $pwd = `pwd`; chomp $pwd;
 my $prefix = $pwd.'/stage';
+my $stagedir;
 my $staged;
 my $module;
 my $thrflavour = 'gcc64dbgpthr';
@@ -71,6 +72,7 @@ my @opts = (
 	'listmodules=s' => \$listmodules,
 	'version=s' => \$version,
 	'output=s' => \$output,
+	'stage=s' => \$stagedir,
 	'help' => \$help,
 );
 
@@ -124,6 +126,8 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
+$stagedir = $prefix unless $stagedir;
+
 if ($mode eq 'build') {
 	print "Writing config.status\n";
 	open CONF,">config.status" or die "config.status: $!\n";
@@ -239,7 +243,7 @@ BEGIN{
 	'lbjp-common.db' => [ qw/mysql/ ],
 	'lbjp-common.maildir' => [ qw// ],
 	'lbjp-common.server-bones' => [ qw// ],
-	'lbjp-common.trio' => [ qw// ],
+	'lbjp-common.trio' => [ qw/cppunit:B/ ],
 	'security.gss' =>  [ qw/globus cares cppunit:B/ ],
 	'security.gsoap-plugin' =>  [ qw/cppunit:B globus cares gsoap:B/ ],
 	'jobid.api-c' =>  [ qw/cppunit:B/ ],
@@ -379,7 +383,7 @@ jp.common/;
 
 	print MKINC qq{
 PREFIX = $prefix
-stagedir = $prefix
+stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
 };
@@ -500,7 +504,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --prefix=\${prefix} --module $subsys.$module @copts
+configure = cd $confdir && \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]