From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Thu, 3 Nov 2005 18:20:19 +0000 (+0000)
Subject: use dynamic c-ares lib instead of static ares lib
X-Git-Tag: merge-1_2_0-to-head_src~83
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d39e908c5ccf05cb8cac45511ba7e63b4037b907;p=jra1mw.git

use dynamic c-ares lib instead of static ares lib
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 5b91a8b..3749bc7 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -14,7 +14,6 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 gsoap_prefix=/opt/gsoap
-
 CC=gcc
 
 gsoap_versions?=2.6.2 2.7.0 2.7.6b
@@ -58,7 +57,7 @@ CFLAGS:= ${DEBUG} \
 	-I${stagedir}/include \
 	-I${globus_prefix}/include/${nothrflavour} \
 	-I${globus_prefix}/include/${nothrflavour}/openssl \
-	-I${ares_prefix}/include \
+	-I${c-ares_prefix}/include \
 	${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION
 
 LDFLAGS:=${COVERAGE_FLAGS}
@@ -76,7 +75,7 @@ GLOBUS_LIBS:= -L${globus_prefix}/lib \
 
 GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap
 
-EX_LIBS:= ${GLOBUS_LIBS} -L${ares_prefix}/lib -lares
+EX_LIBS:= ${GLOBUS_LIBS} -L${c-ares_prefix}/lib -lcares
 
 HDRS:=glite_gss.h glite_gsplugin.h
 
diff --git a/org.glite.security.gsoap-plugin/project/configure.properties.xml b/org.glite.security.gsoap-plugin/project/configure.properties.xml
index e610c13..1fd00f3 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}
+c-ares_prefix=${with.c-ares.prefix}
 globus_prefix=${with.globus.prefix}
 thrflavour=${with.globus.thr.flavor}
 nothrflavour=${with.globus.nothr.flavor}