From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 5 Nov 2007 18:26:39 +0000 (+0000)
Subject: Workaround ssl linking problem from mysql using static library.
X-Git-Tag: glite-jp-server-common_R_1_2_1_2~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=573d8140a6e69ae97e3db4c3d0db167dba144c1d;p=jra1mw.git

Workaround ssl linking problem from mysql using static library.
---

diff --git a/org.glite.jp.server-common/Makefile b/org.glite.jp.server-common/Makefile
index 3e20126..3cfae2f 100644
--- a/org.glite.jp.server-common/Makefile
+++ b/org.glite.jp.server-common/Makefile
@@ -36,7 +36,6 @@ LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS}
 LIBLINK:=${LINK} ${version_info}
 INSTALL:=libtool --mode=install install
 
-
 STATICLIB:=libglite_jp_server_common.a
 LTLIB:=libglite_jp_server_common.la
 
@@ -53,13 +52,13 @@ ifeq (${host_cpu},x86_64)
 endif   
 
 ifneq (${mysql_prefix},/usr)
-	ifeq ($(shell test -f ${mysql_prefix}/${archlib}/libmysqlclient.a -o -f ${mysql_prefix}/${archlib}/libmysqlclient.so && echo ok),ok)
-		MYSQLIB := -L${mysql_prefix}/${archlib} -lmysqlclient -lz
+	ifeq ($(shell test -f ${mysql_prefix}/${archlib}/libmysqlclient.a && echo ok),ok)
+		MYSQLIB := ${mysql_prefix}/${archlib}/libmysqlclient.a -lz
 	else
-		MYSQLIB := -L${mysql_prefix}/${archlib}/mysql -lmysqlclient -lz
+		MYSQLIB := ${mysql_prefix}/${archlib}/mysql/libmysqlclient.a -lz
 	endif
 else
-	MYSQLIB := -lmysqlclient -lz
+	MYSQLIB := /usr/lib/libmysqlclient.a -lz
 endif
 
 
@@ -70,10 +69,11 @@ compile: ${LTLIB} ${STATICLIB}
 ${LTLIB} ${STATICLIB}: ${OBJS}
 	${LIBLINK} ${version_info} -o $@ ${LOBJS} ${MYSQLIB}
 
-examples: db-test-int
+examples:
+# db-test-int
 
 db-test-int: db-test-int.o
-	${LINK} -o $@ $+ ${STATICLIB} ${MYSQLIB} -lglite_jp_common_${nothrflavour} 
+	${LINK} -o $@ $+ ${STATICLIB} ${MYSQLIB} -lglite_jp_common_${nothrflavour}
 
 check: 
 	-echo nothing yet