From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Wed, 8 Mar 2006 11:49:31 +0000 (+0000)
Subject: added mysql dependency
X-Git-Tag: glite-lb-client_R_2_1_4~16
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5d3ec4248956963253f8082a632aa71648ddf038;p=jra1mw.git

added mysql dependency
---

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index a02c3dd..e9aaf59 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -72,12 +72,21 @@ 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
@@ -86,8 +95,9 @@ EXPAT_LIBS := ${EXPAT_LIBS} -lexpat
 ARES_LIBS:=-L${ares_prefix}/lib \
 	-lares
 
-EXT_LIB:= ${EXPAT_LIBS} \
-    ${ARES_LIBS}
+EXT_LIB:= ${mysqlib} -lmysqlclient -lz\
+	${EXPAT_LIBS} \
+	${ARES_LIBS}
 
 TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index 17c4c40..be40450 100644
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$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
 	
@@ -51,6 +54,8 @@ 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>