From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Thu, 19 Jan 2006 12:04:40 +0000 (+0000)
Subject: distinguish threaded/non-threaded globus libraries
X-Git-Tag: glite-lb-common_R_3_0_2~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=53f21e5fdfeedfa821170b4d9c4302b1d53fbf99;p=jra1mw.git

distinguish threaded/non-threaded globus libraries
---

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 8e8c073..17cb422 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -53,6 +53,10 @@ GLOBUS_LIBS:=-L${globus_prefix}/lib \
         -lglobus_common_${nothrflavour} \
         -lglobus_gssapi_gsi_${nothrflavour} \
 
+GLOBUS_THRLIBS:=-L${globus_prefix}/lib \
+        -lglobus_common_${thrflavour} \
+        -lglobus_gssapi_gsi_${thrflavour} \
+
 GLITE_LIBS:=-L${glite_location}/lib
 
 ifneq (${expat_prefix},/usr)
@@ -65,6 +69,7 @@ LDFLAGS:=-L${stagedir}/lib \
     ${COVERAGE_FLAGS}
 
 EXT_LIBS:= ${EXPAT_LIBS} ${ARES_LIBS} ${GLOBUS_LIBS}
+EXT_THRLIBS:= ${EXPAT_LIBS} ${ARES_LIBS} ${GLOBUS_THRLIBS}
 
 # breaks linking when not installed in /opt, /home/dimeglio etc.
 #    ${GLITE_LIBS} \
@@ -151,7 +156,7 @@ ${THRLTLIB}: ${THROBJS}
 	${LINK} ${version_info} -o $@ ${THRLOBJS} \
 		-lglite_security_gss_${thrflavour} \
 		-lglite_wmsutils_cjobid \
-		${EXT_LIBS} \
+		${EXT_THRLIBS} \
 		-lm
 
 stage: compile