From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 15 Mar 2006 17:53:14 +0000 (+0000)
Subject: cares
X-Git-Tag: merge_for_3_1_after~7
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a9aecc686c4568f1a73945497f3107f34212f94d;p=jra1mw.git

cares
---

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 5d2edc2..58fdde0 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -15,7 +15,6 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
-ares_prefix=/opt/ares
 
 -include Makefile.inc
 -include ../Makefile.inc
@@ -37,7 +36,6 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
 	-I${stagedir}/include \
 	-I${glite_location}/include \
 	-I${expat_prefix}/include \
-	-I${ares_prefix}/include \
 	${COVERAGE_FLAGS} \
 	-D_GNU_SOURCE \
 	-DDATAGRID_EXTENSION
@@ -64,18 +62,16 @@ ifneq (${expat_prefix},/usr)
 endif
 EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
 
-ARES_LIBS:=-L${ares_prefix}/lib -lares
 LDFLAGS:=-L${stagedir}/lib \
     ${COVERAGE_FLAGS}
 
-EXT_LIBS:= ${EXPAT_LIBS} ${ARES_LIBS} ${GLOBUS_LIBS}
-EXT_THRLIBS:= ${EXPAT_LIBS} ${ARES_LIBS} ${GLOBUS_THRLIBS}
+EXT_LIBS:= ${EXPAT_LIBS} ${GLOBUS_LIBS}
+EXT_THRLIBS:= ${EXPAT_LIBS} ${GLOBUS_THRLIBS}
 
 # breaks linking when not installed in /opt, /home/dimeglio etc.
 #    ${GLITE_LIBS} \
 #    ${GLOBUS_LIBS} \
-#    ${EXPAT_LIBS} \
-#    ${ARES_LIBS} \
+#    ${EXPAT_LIBS}
 
 TEST_LIBS:=-L${cppunit}/lib -lcppunit
 TEST_INC:=-I${cppunit}/include
diff --git a/org.glite.lb.common/project/configure.properties.xml b/org.glite.lb.common/project/configure.properties.xml
index 911dfcf..979c6f1 100644
--- a/org.glite.lb.common/project/configure.properties.xml
+++ b/org.glite.lb.common/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.3  2004/08/31 07:57:17  akrenek
+	very first unit test
+	
 	Revision 1.2  2004/07/06 20:50:10  flammer
 	Moved to configure.properties.xml
 	
@@ -48,7 +51,6 @@ 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}
 cppunit=${with.cppunit.prefix}