ares to c-ares migration
authorMiloš Mulač <mulac@civ.zcu.cz>
Thu, 3 Nov 2005 17:46:54 +0000 (17:46 +0000)
committerMiloš Mulač <mulac@civ.zcu.cz>
Thu, 3 Nov 2005 17:46:54 +0000 (17:46 +0000)
 - 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.proxy/Makefile
org.glite.lb.proxy/project/configure.properties.xml

index 6c06a69..288b443 100644 (file)
@@ -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
@@ -38,7 +38,7 @@ CFLAGS:= ${DEBUG} \
        -DVERSION=\"${version}\" \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
        -I${expat_prefix}/include \
-       -I${ares_prefix}/include \
+       -I${c-ares_prefix}/include \
        -I${gsoap_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
@@ -83,12 +83,19 @@ ifeq (${nothrflavour},gcc32dbg)
         vomsflavour :=
 endif
 
-EXT_LIBS:= -L${ares_prefix}/lib -lares \
+#EXT_LIBS:= -L${c-ares_prefix}/usr/lib -lcares \
+#      ${mysqlib} -lmysqlclient -lz\
+#      ${expatlib} -lexpat \
+#      ${GRIDSITE_LIBS} \
+#      -lvomsc${vomsflavour} \
+#      ${GLOBUS_LIBS}
+
+EXT_LIBS:=  \
+       -L${c-ares_prefix}/lib -lcares \
        ${mysqlib} -lmysqlclient -lz\
-       ${expatlib} -lexpat \
        ${GRIDSITE_LIBS} \
-       -lvomsc${vomsflavour} \
-       ${GLOBUS_LIBS}
+       -lvomsc${vomsflavour}
+
 
 
 
index ade5207..4bab3d7 100644 (file)
@@ -45,7 +45,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}