From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 14 Apr 2009 16:49:30 +0000 (+0000)
Subject: Fixed libmysql* searching (speed up the build with system's mysql).
X-Git-Tag: glite-lbjp-common-db_R_1_0_0_7~21
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d02e5f95ad2b5a55a1f5c09d75112fd3175e4e73;p=jra1mw.git

Fixed libmysql* searching (speed up the build with system's mysql).
---

diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index 32fc5ea..0a102a2 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=$(shell find ${mysql-devel_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_SONAME:=$(shell -x lib=""; for dir in ${archlib} ${archlib}/mysql lib lib/mysql; do l=$(shell find ${mysql-devel_prefix}/$$dir -maxdepth 1 -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-devel_prefix}/include -I${mysql-devel_prefix}/include/mysql -DMYSQL_SONAME=\"${MYSQL_SONAME}\"
 MYSQL_LIBS=-lz