From 35fc50499036dc64a2d3f8b8fe0eb1efa24bbaf4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Thu, 3 Nov 2005 17:46:51 +0000 Subject: [PATCH] ares to c-ares migration - use dynamic library of c-ares, instead of ares static lib - ares clean up (now should be mentioned only in modules that really need it) - patch for security.gsoap-plugin not yet in CVS (sent to interation list) I do not know what will happen when one try to mix ares with c-ares libs => weird things may arise! --- org.glite.lb.client/Makefile | 8 +------- org.glite.lb.client/project/configure.properties.xml | 4 +++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 89e2250..f118bd5 100644 --- 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 \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE @@ -91,11 +89,7 @@ ifneq (${expat_prefix},/usr) endif EXPAT_LIBS := ${EXPAT_LIBS} -lexpat -ARES_LIBS:=-L${ares_prefix}/lib \ - -lares - -EXT_LIB:= ${EXPAT_LIBS} \ - ${ARES_LIBS} +EXT_LIB:= ${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 17c4c40..430ddde 100644 --- 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.3 2004/08/31 16:32:31 jpospi + First attempt to producer test + Revision 1.2 2004/07/06 20:47:11 flammer Moved to configure.properties.xml @@ -50,7 +53,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} cppunit_prefix=${with.cppunit.prefix} -- 1.8.2.3