From cd443c3ede515b5f96b1d7c758c7f7852a902b56 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 28 Nov 2006 18:49:51 +0000
Subject: [PATCH] Fixed linking with flavoured crypto.

---
 org.glite.jp.common/Makefile        | 14 ++++++++++----
 org.glite.jp.index/Makefile         |  2 +-
 org.glite.jp.primary/Makefile       |  2 +-
 org.glite.jp.server-common/Makefile |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/org.glite.jp.common/Makefile b/org.glite.jp.common/Makefile
index c0aa6b0..26977c6 100644
--- a/org.glite.jp.common/Makefile
+++ b/org.glite.jp.common/Makefile
@@ -47,8 +47,11 @@ HDRS:=types.h context.h strmd5.h attr.h known_attr.h trio.h escape.h
 
 SRCS:=context.c strmd5.c attr.c
 OBJS:=${SRCS:.c=.lo}
+LIBS:=-lcrypto_${nothrflavour}
+LIBS_THR:=-lcrypto_${thrflavour}
 
-commonlib:= libglite_jp_common.la
+commonlib:= libglite_jp_common_${nothrflavour}.la
+commonlib_thr:= libglite_jp_common_${thrflavour}.la
 
 TRIO_OBJS:=escape.o trio.o strio.o
 TRIO_LIB:=libglite_jp_trio.la
@@ -60,10 +63,13 @@ TEST_INC:=-I${cppunit}/include
 
 default all: compile
 
-compile: ${commonlib} ${TRIO_LIB} 
+compile: ${commonlib} ${commonlib_thr} ${TRIO_LIB} 
 
 ${commonlib}: ${OBJS}
-	${LINK} -o $@ ${OBJS} -lcrypto_${nothrflavour}
+	${LINK} -o $@ ${OBJS} ${LIBS}
+
+${commonlib_thr}: ${OBJS}
+	${LINK} -o $@ ${OBJS} ${LIBS}
 
 ${TRIO_LIB}: ${TRIO_LOBJS}
 	${LINK} ${version_info} -o $@ ${TRIO_LOBJS} -lm
@@ -85,7 +91,7 @@ install:
 	-mkdir -p ${PREFIX}/include/${globalprefix}/${jpprefix}
 	cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jpprefix}
 	-mkdir -p ${PREFIX}/lib
-	${INSTALL} -m 755 ${commonlib} ${TRIO_LIB} ${PREFIX}/lib
+	${INSTALL} -m 755 ${commonlib} ${commonlib_thr} ${TRIO_LIB} ${PREFIX}/lib
 
 dist: distsrc distbin
 
diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile
index 7a53618..3950c24 100644
--- a/org.glite.jp.index/Makefile
+++ b/org.glite.jp.index/Makefile
@@ -75,7 +75,7 @@ EXA_DB_OBJS:=${EXA_DB_SRCS:.c=.o}
 EXA_CLIENT_OBJS:=${EXA_CLIENT_SRCS:.c=.o}
 
 
-COMMONLIB:=-lglite_jp_common
+COMMONLIB:=-lglite_jp_common_${nothrflavour}
 SRVCOMMONLIB:=-lglite_jp_server_common
 BONESLIB:=-lglite_lb_server_bones
 TRIOLIB:=-lglite_jp_trio
diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index 9b2efe0..a071071 100644
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -75,7 +75,7 @@ TEST_OBJS:=${TEST_SRCS:.c=.o}
 DAG_OBJS:=${DAG_SRCS:.c=.o}
 
 dotless_soap_ver:=${shell echo ${gsoap_version} | tr -d . }
-COMMONLIB:=-lglite_jp_common
+COMMONLIB:=-lglite_jp_common_${nothrflavour}
 BONESLIB:=-lglite_lb_server_bones
 GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_soap_ver}_${nothrflavour} 
 TRIOLIB:=-lglite_jp_trio
diff --git a/org.glite.jp.server-common/Makefile b/org.glite.jp.server-common/Makefile
index 4e9f04e..ae6a269 100644
--- a/org.glite.jp.server-common/Makefile
+++ b/org.glite.jp.server-common/Makefile
@@ -75,7 +75,7 @@ ${LTLIB} ${STATICLIB}: ${OBJS}
 examples: db-test-int
 
 db-test-int: db-test-int.o
-	${LINK} -o $@ $+ ${STATICLIB} ${MYSQLIB} -lglite_jp_common ${TRIOLIB} ${GLOBUS_LIBS}
+	${LINK} -o $@ $+ ${STATICLIB} ${MYSQLIB} -lglite_jp_common_${nothrflavour} ${TRIOLIB} ${GLOBUS_LIBS}
 
 check: 
 	-echo nothing yet
-- 
1.8.2.3