From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 15 Mar 2006 17:24:11 +0000 (+0000)
Subject: applied the cares patches
X-Git-Tag: merge_for_3_1_after~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2231b9b914a664891c46747f174812b215ecc63e;p=jra1mw.git

applied the cares patches
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 8ced4f6..339e82c 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -56,7 +56,7 @@ CFLAGS:= ${DEBUG} \
 	-DWITH_NONAMESPACES \
 	-I. -I${top_srcdir}/interface \
 	-I${stagedir}/include \
-	-I${ares_prefix}/include \
+	-I${cares_prefix}/include \
 	${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION
 
 LDFLAGS:=${COVERAGE_FLAGS}
@@ -79,7 +79,7 @@ GLOBUS_THR_LIBS:= -L${globus_prefix}/lib \
 	-lglobus_gssapi_gsi_${thrflavour}
 
 GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap
-ARES_LIBS:=-L${ares_prefix}/lib -lares
+ARES_LIBS:=-L${cares_prefix}/lib -lcares
 
 EX_LIBS:= ${GLOBUS_LIBS} ${ARES_LIBS}
 EX_THRLIBS := ${GLOBUS_THR_LIBS} ${ARES_LIBS}
diff --git a/org.glite.security.gsoap-plugin/project/configure.properties.xml b/org.glite.security.gsoap-plugin/project/configure.properties.xml
index e610c13..3977f05 100644
--- a/org.glite.security.gsoap-plugin/project/configure.properties.xml
+++ b/org.glite.security.gsoap-plugin/project/configure.properties.xml
@@ -39,7 +39,7 @@ package=${module.package.name}
 PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
-ares_prefix=${with.ares.prefix}
+cares_prefix=${with.c-ares.prefix}
 globus_prefix=${with.globus.prefix}
 thrflavour=${with.globus.thr.flavor}
 nothrflavour=${with.globus.nothr.flavor}