From 51316f20f9fef1ca2b7ecc3b257d44db361b2e52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 31 May 2005 15:48:11 +0000 Subject: [PATCH] fix build with mysql 4.1 --- org.glite.lb.proxy/Makefile | 6 +++++- org.glite.lb.proxy/project/configure.properties.xml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile index 304e157..3fca712 100644 --- a/org.glite.lb.proxy/Makefile +++ b/org.glite.lb.proxy/Makefile @@ -57,7 +57,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) diff --git a/org.glite.lb.proxy/project/configure.properties.xml b/org.glite.lb.proxy/project/configure.properties.xml index 9238a36..ade5207 100644 --- a/org.glite.lb.proxy/project/configure.properties.xml +++ b/org.glite.lb.proxy/project/configure.properties.xml @@ -47,6 +47,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} -- 1.8.2.3