From: Michal Voců <michal@ruk.cuni.cz>
Date: Wed, 16 May 2012 07:47:54 +0000 (+0000)
Subject: do not add -L/usr/lib explicitely to link options
X-Git-Tag: merge_torque_to_head_after~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=39bebf0b594c72de1fe0ec724e6343fd3b1ab2eb;p=jra1mw.git

do not add -L/usr/lib explicitely to link options
---

diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 320c18e..be1ba9c 100644
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -68,8 +68,16 @@ GLOBUS_THR_LIBS:= -L${globus_prefix}/lib \
 GLOBUS_GSSAPI_NOTHR_LIBS=-lglobus_gssapi_gsi_${nothrflavour}
 GLOBUS_GSSAPI_THR_LIBS=-lglobus_gssapi_gsi_${thrflavour}
 
-KERBEROS_GSSAPI_LIBS=-lgssapi_krb5 
-KERBEROS_GSSAPI_CFLAGS=-DNO_GLOBUS_GSSAPI
+KERBEROS_GSSAPI_LIBDIR?=${kerberos_prefix}/lib
+KERBEROS_GSSAPI_INCDIR?=${kerberos_prefix}/include
+KERBEROS_GSSAPI_LIBNAME?=gssapi_krb5
+
+ifeq (${kerberos_prefix}, /usr)
+KERBEROS_GSSAPI_LIBS=-l${KERBEROS_GSSAPI_LIBNAME}
+else
+KERBEROS_GSSAPI_LIBS=-L${KERBEROS_GSSAPI_LIBDIR} -l${KERBEROS_GSSAPI_LIBNAME}
+endif
+KERBEROS_GSSAPI_CFLAGS=-I${KERBEROS_GSSAPI_INCDIR} -DNO_GLOBUS_GSSAPI
 
 GLOBUS_GSSAPI_GSI_LIBS?=${GLOBUS_THR_LIBS} ${GLOBUS_GSSAPI_THR_LIBS}
 GLOBUS_GSSAPI_GSI_CFLAGS?=${GLOBUS_THR_INC}