From 74ae4f9262b4fea0fc663a32ea5d7795d251d272 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Thu, 3 Nov 2005 17:46:53 +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.common/Makefile | 5 +---- org.glite.lb.common/project/configure.properties.xml | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 2d3ac3e..651e97f 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 @@ -60,11 +58,10 @@ 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_LIBS:= ${EXPAT_LIBS} ${GLOBUS_LIBS} # breaks linking when not installed in /opt, /home/dimeglio etc. # ${GLITE_LIBS} \ 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} -- 1.8.2.3