From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 10 May 2006 07:59:27 +0000 (+0000)
Subject: revert changes that should not have gone to the 3.0 branch
X-Git-Tag: glite-lb-client_R_2_1_4~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9d0bcbef401ebbdad360d8c782f21f971a1ac7e7;p=jra1mw.git

revert changes that should not have gone to the 3.0 branch
---

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 334bbff..e25e248 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -72,21 +72,12 @@ CFLAGS:=${DEBUG} \
 	-I${glite_location}/include \
 	-I${expat_prefix}/include \
 	-I${ares_prefix}/include \
-	-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
 	${COVERAGE_FLAGS} \
 	-D_GNU_SOURCE
 
 
 CXXFLAGS:=${CFLAGS}
 
-ifneq (${mysql_prefix},/usr)
-	ifeq ($(shell echo ${mysql_version} | cut -d. -f1,2),4.1)
-		mysqlib := -L${mysql_prefix}/lib/mysql
-	else
-		mysqlib := -L${mysql_prefix}/lib
-	endif
-endif
-
 ifneq (${expat_prefix},/usr)
 	EXPAT_LIBS:=-L${expat_prefix}/lib
 endif
@@ -95,9 +86,8 @@ EXPAT_LIBS := ${EXPAT_LIBS} -lexpat
 ARES_LIBS:=-L${ares_prefix}/lib \
 	-lares
 
-EXT_LIB:= ${mysqlib} -lmysqlclient -lz\
-	${EXPAT_LIBS} \
-	${ARES_LIBS}
+EXT_LIB:= ${EXPAT_LIBS} \
+    ${ARES_LIBS}
 
 TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
@@ -142,9 +132,9 @@ PLUSLIB:=libglite_lb_clientpp_${nothrflavour}.la
 THRPLUSLIB:=libglite_lb_clientpp_${thrflavour}.la
 
 TOOLS:=dump load purge lb_dump_exporter
-EXAMPLES:=log_usertag_proxy job_log job_reg feed_shark notify query_ext query_seq_code stats abort_job change_acl lbmon stresslog
+EXAMPLES:=log_usertag_proxy job_log job_reg feed_shark notify query_ext query_seq_code stats abort_job change_acl lbmon
 
-EXAMPLES_CL=user_jobs job_status 
+EXAMPLES_CL=user_jobs job_status
 FAKE_EXAMPLES:=job_log_fake
 
 MAN_GZ:=glite-lb-logevent.1.gz
@@ -184,9 +174,6 @@ ${THRPLUSLIB}: ${PLUSTHROBJS}
 logevent: logevent.o args.o
 	${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB} 
 
-lbmon-db: lbmon-db.o
-	${LINK} -o $@ lbmon-db.o -lmysqlclient -lglite_lb_bkserver ${LIB} ${EXT_LIB} 
-
 ${TOOLS} ${EXAMPLES}: %: %.o
 	${LINK} -o $@ $< ${LIB} ${EXT_LIB} 
 
@@ -243,7 +230,7 @@ ${MAN_GZ}: ${MAN}
 default: all
 
 
-compile all: check_version ${LIB} ${THRLIB} ${TOOLS} logevent lbmon-db ${PLUSLIB} ${THRPLUSLIB} examples ${MAN_GZ}
+compile all: check_version ${LIB} ${THRLIB} ${TOOLS} logevent ${PLUSLIB} ${THRPLUSLIB} examples ${MAN_GZ}
 
 examples: ${EXAMPLES} ${EXAMPLES_CL} ${sh_PROGS}
 
@@ -289,16 +276,15 @@ install:
 	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
 	${INSTALL} -m 644 ${top_srcdir}/doc/README-fake ${top_srcdir}/doc/README-notify ${PREFIX}/share/doc/${package}-${version}
 	mkdir -p ${PREFIX}/examples
-	for p in logevent ; do \
+	for p in logevent; do \
 		${INSTALL} -m 755 "$$p" "${PREFIX}/bin/glite-lb-$$p"; \
 	done
 	for p in ${TOOLS} ; do \
 		${INSTALL} -m 755 "$$p" "${PREFIX}/sbin/glite-lb-$$p"; \
 	done
-	for p in ${EXAMPLES} lbmon-db ${EXAMPLES_CL} ${sh_PROGS} ; do \
+	for p in ${EXAMPLES} ${EXAMPLES_CL} ${sh_PROGS}; do \
 		${INSTALL} -m 755 "$$p" "${PREFIX}/examples/glite-lb-$$p"; \
 	done
-	${INSTALL} -m 755 ${top_srcdir}/examples/export.sh "${PREFIX}/examples/glite-lb-export.sh"
 	${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man1
 
 clean:
diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index be40450..f710ff2 100644
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -22,7 +22,7 @@
 	$Log$
 	Revision 1.3  2004/08/31 16:32:31  jpospi
 	First attempt to producer test
-	
+
 	Revision 1.2  2004/07/06 20:47:11  flammer
 	Moved to configure.properties.xml
 	
@@ -54,8 +54,6 @@ 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_prefix=${with.cppunit.prefix}
 			</echo>
 	    </target>