From 04678ceaf110120fecf4f58d666e365fa53b027a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Thu, 3 Nov 2005 17:46:57 +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.utils/Makefile | 4 +--- org.glite.lb.utils/project/configure.properties.xml | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile index c99910c..159bf2b 100644 --- a/org.glite.lb.utils/Makefile +++ b/org.glite.lb.utils/Makefile @@ -15,7 +15,6 @@ globus_prefix=/opt/globus nothrflavour=gcc32 thrflavour=gcc32pthr expat_prefix=/opt/expat -ares_prefix=/opt/ares gsoap_prefix=/opt/gsoap -include Makefile.inc @@ -30,7 +29,6 @@ CFLAGS:= \ -I${stagedir}/include -I${top_srcdir}/src -I. \ -I${top_srcdir}/interface \ -I${expat_prefix}/include \ - -I${ares_prefix}/include \ -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ ${COVERAGE_FLAGS} \ -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \ @@ -75,7 +73,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.utils/project/configure.properties.xml b/org.glite.lb.utils/project/configure.properties.xml index 5421722..9329814 100644 --- a/org.glite.lb.utils/project/configure.properties.xml +++ b/org.glite.lb.utils/project/configure.properties.xml @@ -20,6 +20,9 @@ Revision history: $Log$ + Revision 1.1.1.1 2005/09/30 15:17:04 jpospi + New org.glite.lb.utils component + --> @@ -42,7 +45,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=${with.cppunit.prefix} -- 1.8.2.3