From 6c1266ba2f7a294918ec17db014c33eb59ff1490 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Thu, 9 Oct 2008 12:43:08 +0000 Subject: [PATCH] - more thorough check for existence of libmysqlclient.so - more places to look for it --- org.glite.lbjp-common.db/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile index 0fc856a..373eb32 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=/dev/null; for dir in '' mysql; do lib=${mysql_prefix}/${archlib}/$$dir/libmysqlclient.so; [ -f $$lib ] && break; done; readelf -d $$lib | grep SONAME | sed 's/.*\(libmysqlclient.so.[0-9]\{1,\}\).*/\1/' || echo notfound ) +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_CPPFLAGS:=-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -DMYSQL_SONAME=\"${MYSQL_SONAME}\" MYSQL_LIBS=-lz -- 1.8.2.3