From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 23 May 2011 18:26:37 +0000 (+0000)
Subject: Fix defaults for some --with-* arguments. -lgsoap++ in gLite build is found now.
X-Git-Tag: merge_2_1_to_3_0_dst~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=49ff55a8ebbcaf03d0d0ba044c8d8025ac89edad;p=jra1mw.git

Fix defaults for some --with-* arguments. -lgsoap++ in gLite build is found now.
---

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 0e0c292..e2b3330 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -248,6 +248,10 @@ $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-serv
 $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq '';
 $externs{'gsoapxx'}{prefix}=$externs{gsoap}{prefix} if $externs{'gsoapxx'}{prefix} eq '';
 
+$externs{'mysql-server'}{withprefix}=$externs{mysql}{withprefix} if $externs{'mysql-server'}{withprefix} eq '';
+$externs{'mysql-devel'}{wihtprefix}=$externs{mysql}{withprefix} if $externs{'mysql-devel'}{withprefix} eq '';
+$externs{'gsoapxx'}{withprefix}=$externs{gsoap}{withprefix} if $externs{'gsoapxx'}{withprefix} eq '';
+
 %project = %{$projects{$project}};
 for $_ (keys %{$project{etics_externs}}) {
 	$etics_externs{$_} = $project{etics_externs}{$_};
diff --git a/org.glite.lbjp-common.gsoap-plugin/configure b/org.glite.lbjp-common.gsoap-plugin/configure
index 27f197c..1866e32 100755
--- a/org.glite.lbjp-common.gsoap-plugin/configure
+++ b/org.glite.lbjp-common.gsoap-plugin/configure
@@ -248,6 +248,10 @@ $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-serv
 $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq '';
 $externs{'gsoapxx'}{prefix}=$externs{gsoap}{prefix} if $externs{'gsoapxx'}{prefix} eq '';
 
+$externs{'mysql-server'}{withprefix}=$externs{mysql}{withprefix} if $externs{'mysql-server'}{withprefix} eq '';
+$externs{'mysql-devel'}{wihtprefix}=$externs{mysql}{withprefix} if $externs{'mysql-devel'}{withprefix} eq '';
+$externs{'gsoapxx'}{withprefix}=$externs{gsoap}{withprefix} if $externs{'gsoapxx'}{withprefix} eq '';
+
 %project = %{$projects{$project}};
 for $_ (keys %{$project{etics_externs}}) {
 	$etics_externs{$_} = $project{etics_externs}{$_};