cares

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 544026d..22d171f 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -15,7 +15,6 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
-ares_prefix=/opt/ares
 
 CC:=gcc
 CXX:=g++
@@ -71,7 +70,6 @@ CFLAGS:=${DEBUG} \
        -I${stagedir}/include \
        -I${glite_location}/include \
        -I${expat_prefix}/include \
-       -I${ares_prefix}/include \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        ${COVERAGE_FLAGS} \
        -D_GNU_SOURCE
@@ -92,12 +90,8 @@ ifneq (${expat_prefix},/usr)
 endif
 EXPAT_LIBS := ${EXPAT_LIBS} -lexpat
 
-ARES_LIBS:=-L${ares_prefix}/lib \
-       -lares
-
 EXT_LIB:= ${mysqlib} -lmysqlclient -lz\
-       ${EXPAT_LIBS} \
-       ${ARES_LIBS}
+       ${EXPAT_LIBS}
 
 TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include

diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index b6a2803..7fb2f41 100644 (file)
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.4  2006/03/15 17:59:04  akrenek
+       merge 1.5
+       
        Revision 1.3.14.1  2006/03/08 11:49:31  jpospi
        added mysql dependency
        
@@ -56,7 +59,6 @@ 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}
 mysql_prefix=${with.mysql.prefix}
 mysql_version=${ext.mysql.version}
 cppunit_prefix=${with.cppunit.prefix}