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

cares
---

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 7829e74..b81524e 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -15,7 +15,7 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
-ares_prefix=/opt/ares
+cares_prefix=/opt/c-ares
 gsoap_prefix=/opt/gsoap
 
 -include Makefile.inc
@@ -59,7 +59,7 @@ CFLAGS:= \
 	-I${stagedir}/include -I${top_srcdir}/src -I. \
 	-I${top_srcdir}/interface \
 	-I${expat_prefix}/include \
-	-I${ares_prefix}/include \
+	-I${cares_prefix}/include \
 	-I${gsoap_prefix}/include -I${gsoap_prefix}/ \
 	${COVERAGE_FLAGS} \
 	-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
@@ -110,7 +110,7 @@ ifeq (${nothrflavour},gcc32dbg)
 	vomsflavour :=
 endif
 
-#EXT_LIBS:= -L${ares_prefix}/lib -lares \
+#EXT_LIBS:= \
 #	${mysqlib} -lmysqlclient -lz\
 #	${expatlib} -lexpat \
 #	${GRIDSITE_LIBS} \
diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml
index c5b2837..6a1250a 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.9  2006/03/15 18:12:21  akrenek
+	merge 1.5
+	
 	Revision 1.8.4.2  2006/02/20 09:14:30  zsalvet
 	Revert unfinished changes committed by mistake.
 	
@@ -92,7 +95,7 @@ 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}
+cares_prefix=${with.c-ares.prefix}
 mysql_prefix=${with.mysql.prefix}
 mysql_version=${ext.mysql.version}
 cppunit=${with.cppunit.prefix}