From 5804b2defbb13034005faca94ab9d1bd0a365c91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 22 Jun 2012 14:07:01 +0000 Subject: [PATCH] Clanups. --- org.glite.lbjp-common.gss/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile index b973ee0..6aac8c8 100644 --- a/org.glite.lbjp-common.gss/Makefile +++ b/org.glite.lbjp-common.gss/Makefile @@ -73,11 +73,11 @@ KERBEROS_GSSAPI_INCDIR?=${kerberos_prefix}/include KERBEROS_GSSAPI_LIBNAME?=gssapi_krb5 ifeq (${kerberos_prefix}, /usr) -KERBEROS_GSSAPI_LIBS=-l${KERBEROS_GSSAPI_LIBNAME} +KERBEROS_GSSAPI_LIBS?=-l${KERBEROS_GSSAPI_LIBNAME} else -KERBEROS_GSSAPI_LIBS=-L${KERBEROS_GSSAPI_LIBDIR} -l${KERBEROS_GSSAPI_LIBNAME} +KERBEROS_GSSAPI_LIBS?=-L${KERBEROS_GSSAPI_LIBDIR} -l${KERBEROS_GSSAPI_LIBNAME} endif -KERBEROS_GSSAPI_CFLAGS=-I${KERBEROS_GSSAPI_INCDIR} -DNO_GLOBUS_GSSAPI +KERBEROS_GSSAPI_CFLAGS?=-I${KERBEROS_GSSAPI_INCDIR} GLOBUS_GSSAPI_GSI_LIBS?=${GLOBUS_THR_LIBS} ${GLOBUS_GSSAPI_THR_LIBS} GLOBUS_GSSAPI_GSI_CFLAGS?=${GLOBUS_THR_INC} @@ -87,9 +87,9 @@ GLOBUS_COMMON_CFLAGS?=${GLOBUS_THR_INC} ifeq ($(gssapi_provider),kerberos) GSSAPI_THR_LIBS=${GLOBUS_COMMON_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl -GSSAPI_THR_INC=${GLOBUS_COMMON_CFLAGS} ${KERBEROS_GSSAPI_CFLAGS} +GSSAPI_THR_INC=${GLOBUS_COMMON_CFLAGS} ${KERBEROS_GSSAPI_CFLAGS} -DNO_GLOBUS_GSSAPI GSSAPI_NOTHR_LIBS=${GLOBUS_NOTHR_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl -GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC} ${KERBEROS_GSSAPI_CFLAGS} +GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC} ${KERBEROS_GSSAPI_CFLAGS} -DNO_GLOBUS_GSSAPI else GSSAPI_THR_LIBS=${GLOBUS_GSSAPI_GSI_LIBS} GSSAPI_THR_INC=${GLOBUS_GSSAPI_GSI_CFLAGS} -- 1.8.2.3