From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 10 Feb 2009 14:02:36 +0000 (+0000)
Subject: Continue build even if libmysqlclient.so link does not exist (but the actual library... 
X-Git-Tag: glite-lbjp-common-db_R_1_0_0_4~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=97d71c6c01fd17aab415139b7440d10c55982148;p=jra1mw.git

Continue build even if libmysqlclient.so link does not exist (but the actual library does)
---

diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index f9cec18..1daa9b6 100644
--- a/org.glite.lbjp-common.db/Makefile
+++ b/org.glite.lbjp-common.db/Makefile
@@ -32,7 +32,7 @@ ifeq (${host_cpu},x86_64)
 	archlib:=lib64
 endif   
 
-MYSQL_SONAME:=$(shell lib=""; for dir in ${archlib} ${archlib}/mysql lib lib/mysql; do l=${mysql_prefix}/$$dir/libmysqlclient.so; [ -f $$l ] && { lib=$$l; break;} ; done; if [ x != x$$lib ]; then readelf -d $$lib | grep SONAME | sed 's/.*\(libmysqlclient.so.[0-9]\{1,\}\).*/\1/'; else echo notfound; fi )
+MYSQL_SONAME:=$(shell lib=""; for dir in ${archlib} ${archlib}/mysql lib lib/mysql; do l=$(shell find ${mysql_prefix}/$$dir -name libmysqlclient.so* | head -n 1); [ -f $$l ] && { lib=$$l; break;} ; done; if [ x != x$$lib ]; then readelf -d $$lib | grep SONAME | sed 's/.*\(libmysqlclient.so.[0-9]\{1,\}\).*/\1/'; else echo notfound; fi )
 
 MYSQL_CPPFLAGS:=-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -DMYSQL_SONAME=\"${MYSQL_SONAME}\"
 MYSQL_LIBS=-lz