From 4a5b0bdb98fb36c5f9ea85ceb5110d13cc35d693 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Fri, 21 Jan 2005 11:27:44 +0000 Subject: [PATCH] completely remove gridsite.prefix and voms.prefix --- org.glite.lb.server/Makefile | 7 ++----- org.glite.lb.server/project/configure.properties.xml | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 6989608..2f647e6 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -17,8 +17,6 @@ thrflavour=gcc32pthr expat_prefix=/opt/expat ares_prefix=/opt/ares gsoap_prefix=/opt/gsoap -gridsite_prefix=/opt/gridsite -voms_prefix=/opt/voms -include Makefile.inc @@ -54,8 +52,8 @@ DEBUG:=-g -O0 -Wall # -I${gacl}/include \ # -I/usr/include/libxml2 -GRIDSITE_CFLAGS = -I${gridsite_prefix}/include `xml2-config --cflags` -GRIDSITE_LIBS = -L${gridsite_prefix}/lib -lgridsite `xml2-config --libs` +GRIDSITE_CFLAGS = `xml2-config --cflags` +GRIDSITE_LIBS = -lgridsite `xml2-config --libs` # -DNO_VOMS -DNO_GACL to be removed when voms/gridsite are available #CFLAGS:= -DNO_VOMS -DNO_GACL @@ -71,7 +69,6 @@ CFLAGS:= \ -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \ -I${globus_prefix}/include/${nothrflavour} \ $(GRIDSITE_CFLAGS) \ - -I${voms_prefix}/include \ -D_GNU_SOURCE TEST_LIBS:=-L${cppunit}/lib -lcppunit diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml index 7e569f7..25ec0ca 100644 --- a/org.glite.lb.server/project/configure.properties.xml +++ b/org.glite.lb.server/project/configure.properties.xml @@ -20,6 +20,9 @@ Revision history: $Log$ + Revision 1.5 2005/01/20 11:43:00 jpospi + handle correctly gridsite_prefix and voms_prefix + Revision 1.4 2004/10/15 11:03:03 jskrabal - merge fixes @@ -74,9 +77,7 @@ expat_prefix=${with.expat.prefix} ares_prefix=${with.ares.prefix} mysql_prefix=${with.mysql.prefix} cppunit=${with.cppunit.prefix} -gridsite_prefix=${with.gridsite.prefix} gsoap_prefix=${with.gsoap.prefix} -voms_prefix=${with.voms.prefix} -- 1.8.2.3