From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 19 Dec 2005 18:13:30 +0000 (+0000)
Subject: better way to look where libmysqlclient is (IA64 related)
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3e1b8c7cb50d3e983d57591a27d68b5a6aa702b4;p=jra1mw.git

better way to look where libmysqlclient is (IA64 related)
---

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index 22231f9..10a5328 100644
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -74,10 +74,10 @@ GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_soap_ver}_${
 TRIOLIB:=-lglite_jp_trio
 
 ifneq (${mysql_prefix},/usr)
-	ifeq ($(shell echo ${mysql_version} | cut -d. -f1,2),4.1)
-		MYSQLIB := -L${mysql_prefix}/lib/mysql -lmysqlclient -lz
-        else
+	ifeq ($(shell test -f ${mysql_prefix}/lib/libmysqlclient.a -o -f ${mysql_prefix}/lib/libmysqlclient.so && echo ok),ok)
 		MYSQLIB := -L${mysql_prefix}/lib -lmysqlclient -lz
+        else
+		MYSQLIB := -L${mysql_prefix}/lib/mysql -L${mysql_prefix}/lib -lmysqlclient -lz
         endif
 else
 	MYSQLIB := -lmysqlclient