From 483e9493a431934b286783a2e7f9a451b3238478 Mon Sep 17 00:00:00 2001
From: Joachim Flammer <joachim.flammer@cern.ch>
Date: Tue, 6 Jul 2004 20:50:10 +0000
Subject: [PATCH] Moved to configure.properties.xml

---
 org.glite.lb.client/project/configure-options.xml  | 55 -------------------
 .../project/configure.properties.xml               |  5 +-
 org.glite.lb.common/project/configure-options.xml  | 61 ----------------------
 .../project/configure.properties.xml               | 11 +---
 4 files changed, 4 insertions(+), 128 deletions(-)
 delete mode 100644 org.glite.lb.client/project/configure-options.xml
 delete mode 100644 org.glite.lb.common/project/configure-options.xml

diff --git a/org.glite.lb.client/project/configure-options.xml b/org.glite.lb.client/project/configure-options.xml
deleted file mode 100644
index c0999ff..0000000
--- a/org.glite.lb.client/project/configure-options.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-	Copyright (c) 2004 on behalf of the EU EGEE Project: 
-	The European Organization for Nuclear Research (CERN), 
-	Istituto Nazionale di Fisica Nucleare (INFN), Italy
-	Datamat Spa, Italy
-	Centre National de la Recherche Scientifique (CNRS), France
-	CS Systeme d'Information (CSSI), France
-	Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-	Universiteit van Amsterdam (UvA), Netherlands
-	University of Helsinki (UH.HIP), Finland
-	University of Bergen (UiB), Norway
-	Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-	Configuration options for the GLite LB Client module
-	
-	Authors: Ales Krenek <ljocha@ics.muni.cz>
-	Version info: $Id$
-	Release: $Name$
-
-	Revision history:
-	$Log$
-	Revision 1.1  2004/06/23 02:08:44  dimeglio
-	First version of this file
-	
--->
-
-	<!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-	<project name="LB Client configuration options">                                                                        
-		<target name="lbmakefiles">
-			<exec executable="ln" failonerror="true">
-				<arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-			</exec>
-			<echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-			</echo>
-	    </target>
-	</project>
diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index 0baa2d6..1005c5c 100644
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -20,8 +20,6 @@
 
 	Revision history:
 	$Log$
-	Revision 1.1  2004/06/23 02:08:44  dimeglio
-	First version of this file
 	
 -->
 
@@ -46,7 +44,8 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-globusflavour=${with.globus.dbg.nothr.flavor}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 ares_prefix=${with.ares.prefix}
 			</echo>
diff --git a/org.glite.lb.common/project/configure-options.xml b/org.glite.lb.common/project/configure-options.xml
deleted file mode 100644
index 351b59d..0000000
--- a/org.glite.lb.common/project/configure-options.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-	Copyright (c) 2004 on behalf of the EU EGEE Project: 
-	The European Organization for Nuclear Research (CERN), 
-	Istituto Nazionale di Fisica Nucleare (INFN), Italy
-	Datamat Spa, Italy
-	Centre National de la Recherche Scientifique (CNRS), France
-	CS Systeme d'Information (CSSI), France
-	Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-	Universiteit van Amsterdam (UvA), Netherlands
-	University of Helsinki (UH.HIP), Finland
-	University of Bergen (UiB), Norway
-	Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-	Configuration options for the GLite LB Common module
-	
-	Authors: Ales Krenek <ljocha@ics.muni.cz>
-	Version info: $Id$
-	Release: $Name$
-
-	Revision history:
-	$Log$
-	Revision 1.3  2004/06/23 00:33:21  dimeglio
-	Added globalprefix and lbprefix
-	
-	Revision 1.2  2004/06/22 22:49:08  dimeglio
-	Use of stage.abs.dir is required by -rpath
-	
-	Revision 1.1  2004/06/22 22:04:55  dimeglio
-	First version of this file
-	
--->
-
-	<!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-	<project name="LB Common configuration options">                                                                        
-		<target name="lbmakefiles">
-			<exec executable="ln" failonerror="true">
-				<arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-			</exec>
-			<echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-			</echo>
-	    </target>
-	</project>
diff --git a/org.glite.lb.common/project/configure.properties.xml b/org.glite.lb.common/project/configure.properties.xml
index 2cd4ebd..6a4ed99 100644
--- a/org.glite.lb.common/project/configure.properties.xml
+++ b/org.glite.lb.common/project/configure.properties.xml
@@ -20,14 +20,6 @@
 
 	Revision history:
 	$Log$
-	Revision 1.3  2004/06/23 00:33:21  dimeglio
-	Added globalprefix and lbprefix
-	
-	Revision 1.2  2004/06/22 22:49:08  dimeglio
-	Use of stage.abs.dir is required by -rpath
-	
-	Revision 1.1  2004/06/22 22:04:55  dimeglio
-	First version of this file
 	
 -->
 
@@ -52,9 +44,10 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-globusflavour=${with.globus.dbg.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 ares_prefix=${with.ares.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
 			</echo>
 	    </target>
 	</project>
-- 
1.8.2.3