From ca30f5a81fb6cf5e37c8d84419111b5934e1d099 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Wed, 15 Mar 2006 18:32:35 +0000 Subject: [PATCH] cares --- org.glite.lb.logger/Makefile | 3 +-- org.glite.lb.logger/project/configure.properties.xml | 4 +++- org.glite.lb.proxy/Makefile | 4 +--- org.glite.lb.proxy/project/configure.properties.xml | 1 - org.glite.lb.proxy/src/lbproxy.c | 1 - org.glite.lb.utils/Makefile | 4 +--- org.glite.lb.utils/project/configure.properties.xml | 4 +++- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 0690f3d..313bc41 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -15,7 +15,6 @@ globus_prefix=/opt/globus nothrflavour=gcc32 thrflavour=gcc32pthr expat_prefix=/opt/expat -ares_prefix=/opt/ares -include Makefile.inc @@ -57,7 +56,7 @@ ifneq (${expat_prefix},/usr) endif EXPAT_LIBS:=${EXPAT_LIBS} -lexpat -EXT_LIBS:= -L${ares_prefix}/lib -lares ${EXPAT_LIBS} +EXT_LIBS:= ${EXPAT_LIBS} COMMON_LIB:=-lglite_lb_common GLITE_GSS_LIB:=-lglite_security_gss diff --git a/org.glite.lb.logger/project/configure.properties.xml b/org.glite.lb.logger/project/configure.properties.xml index 0e51395..6918019 100644 --- a/org.glite.lb.logger/project/configure.properties.xml +++ b/org.glite.lb.logger/project/configure.properties.xml @@ -20,6 +20,9 @@ Revision history: $Log$ + Revision 1.2 2004/08/31 13:44:44 mvocu + * added cppunit + Revision 1.1 2004/07/07 12:08:47 akrenek *** empty log message *** @@ -53,7 +56,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} cppunit_prefix=${with.cppunit.prefix} diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile index 9dc873c..f16d700 100644 --- a/org.glite.lb.proxy/Makefile +++ b/org.glite.lb.proxy/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 @@ -38,7 +37,6 @@ CFLAGS:= ${DEBUG} \ -DVERSION=\"${version}\" \ -I${stagedir}/include -I${top_srcdir}/src -I. \ -I${expat_prefix}/include \ - -I${ares_prefix}/include \ -I${gsoap_prefix}/include \ ${COVERAGE_FLAGS} \ -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \ @@ -83,7 +81,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.proxy/project/configure.properties.xml b/org.glite.lb.proxy/project/configure.properties.xml index ade5207..42628fe 100644 --- a/org.glite.lb.proxy/project/configure.properties.xml +++ b/org.glite.lb.proxy/project/configure.properties.xml @@ -45,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} diff --git a/org.glite.lb.proxy/src/lbproxy.c b/org.glite.lb.proxy/src/lbproxy.c index cd22a70..c7d5329 100644 --- a/org.glite.lb.proxy/src/lbproxy.c +++ b/org.glite.lb.proxy/src/lbproxy.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include 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