Revert unfinished changes committed by mistake.

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 013e164..100d2aa 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -17,7 +17,6 @@ thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 ares_prefix=/opt/ares
 gsoap_prefix=/opt/gsoap
-classads_prefix=/opt/classads
 
 -include Makefile.inc
 
@@ -62,7 +61,6 @@ CFLAGS:= \
        -I${expat_prefix}/include \
        -I${ares_prefix}/include \
        -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
-       -I${classads_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \
@@ -119,14 +117,9 @@ endif
 #      -lvomsc${vomsflavour} \
 #      ${GLOBUS_LIBS}
 
-ifneq (${classads_prefix},/usr)
-       classadslib := -L${classads_prefix}/lib -lclassad
-endif
-
 EXT_LIBS:=  \
        ${mysqlib} -lmysqlclient -lz\
        ${GRIDSITE_LIBS} \
-       ${classadslib} \
        -lvomsc${vomsflavour}
 
 SRVBONES_LIB:= -L${stagedir}/lib -lglite_lb_server_bones

diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml
index 2ee3aec..21c5527 100644 (file)
--- a/org.glite.lb.server/project/configure.properties.xml
+++ b/org.glite.lb.server/project/configure.properties.xml
@@ -95,7 +95,6 @@ mysql_version=${ext.mysql.version}
 cppunit=${with.cppunit.prefix}
 gsoap_prefix=${with.gsoap.prefix}
 gsoap_version=${ext.gsoap.version}
-classads_prefix=${with.classads.prefix}
                        </echo>
            </target>
        </project>