From 264d65c8c6529e1fb44e114de8e71b2a39ec805d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Thu, 3 Nov 2005 17:46:55 +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.server/Makefile | 5 +++-- org.glite.lb.server/project/configure.properties.xml | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 7829e74..2b68086 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 +c-ares_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${c-ares_prefix}/include \ -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ ${COVERAGE_FLAGS} \ -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \ @@ -118,6 +118,7 @@ endif # ${GLOBUS_LIBS} EXT_LIBS:= \ + -L${c-ares_prefix}/lib -lcares \ ${mysqlib} -lmysqlclient -lz\ ${GRIDSITE_LIBS} \ -lvomsc${vomsflavour} diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml index f533759..9183d8b 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.8 2005/09/19 15:24:20 akrenek + "The gigantic merge"; from release 1.4 branch to HEAD + Revision 1.7.2.1 2005/08/09 15:02:10 jskrabal - build with broken gsoap 2.7.0 repository package @@ -86,7 +89,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} +c-ares_prefix=${with.c-ares.prefix} mysql_prefix=${with.mysql.prefix} mysql_version=${ext.mysql.version} cppunit=${with.cppunit.prefix} -- 1.8.2.3