fix build with mysql 4.1.x

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index a08c174..0bfca0f 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -77,7 +77,11 @@ GLOBUS_LIBS:= -L${globus_prefix}/lib \
        -lglobus_gssapi_gsi_${nothrflavour} \
 
 ifneq (${mysql_prefix},/usr)
-       myslqlib := -L${mysql_prefix}/lib
+       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)
@@ -85,7 +89,7 @@ ifneq (${expat_prefix},/usr)
 endif
 
 EXT_LIBS:= -L${ares_prefix}/lib -lares \
-       ${myslqlib} -lmysqlclient -lz\
+       ${mysqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
        ${GRIDSITE_LIBS} \
        -lvomsc \

diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml
index cbf186d..aee57be 100644 (file)
--- a/org.glite.lb.server/project/configure.properties.xml
+++ b/org.glite.lb.server/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.4  2004/10/15 11:03:03  jskrabal
+       - merge fixes
+       
        Revision 1.3  2004/10/06 08:14:36  dkouril
        Support for VOMS and GACL (gridsite) from SCM CVS
        - legacy names of GACL routines changed to new ones, which also prevents from
@@ -70,6 +73,7 @@ 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}
 gridsite_prefix=${with.gridsite.prefix}
 gsoap_prefix=${with.gsoap.prefix}