Update build for flavour-less globus (using GSSAPI_* variables for complete Kerberos...

diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 93d88cc..c895fb0 100644 (file)
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -65,25 +65,28 @@ GLOBUS_NOTHR_LIBS:= -L${globus_prefix}/lib \
 GLOBUS_THR_LIBS:= -L${globus_prefix}/lib \
        -lglobus_common_${thrflavour} 
 
-GLOBUS_GSSAPI_GSI_LIBS?=${GLOBUS_NOTHR_LIBS}
-GLOBUS_GSSAPI_GSI_CFLAGS?=${GLOBUS_NOTHR_INC}
-
 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
 
+GLOBUS_GSSAPI_GSI_LIBS?=${GLOBUS_NOTHR_LIBS} ${GLOBUS_GSSAPI_NOTHR_LIBS}
+GLOBUS_GSSAPI_GSI_CFLAGS?=${GLOBUS_NOTHR_INC}
+
+GLOBUS_COMMON_LIBS?=${GLOBUS_NOTHR_LIBS}
+GLOBUS_COMMON_CFLAGS?=${GLOBUS_NOTHR_INC}
+
 ifeq ($(gssapi_provider),kerberos)
-GSSAPI_NOTHR_LIBS=${KERBEROS_GSSAPI_LIBS} -lssl_${nothrflavour}
-GSSAPI_THR_LIBS=${KERBEROS_GSSAPI_LIBS} -lssl_${thrflavour}
-GSSAPI_THR_INC=${KERBEROS_GSSAPI_CFLAGS}
-GSSAPI_NOTHR_INC=${KERBEROS_GSSAPI_CFLAGS}
+GSSAPI_NOTHR_LIBS=${GLOBUS_COMMON_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl_${nothrflavour}
+GSSAPI_THR_LIBS=${GLOBUS_COMMON_CFLAGS} ${KERBEROS_GSSAPI_LIBS} -lssl_${thrflavour}
+GSSAPI_THR_INC=${GLOBUS_THR_INC} ${KERBEROS_GSSAPI_CFLAGS}
+GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC} ${KERBEROS_GSSAPI_CFLAGS}
 else
-GSSAPI_NOTHR_LIBS=${GLOBUS_GSSAPI_NOTHR_LIBS}
-GSSAPI_THR_LIBS=${GLOBUS_GSSAPI_THR_LIBS}
-GSSAPI_THR_INC=
-GSSAPI_NOTHR_INC=
+GSSAPI_NOTHR_LIBS=${GLOBUS_GSSAPI_GSI_LIBS}
+GSSAPI_THR_LIBS=${GLOBUS_THR_LIBS} ${GLOBUS_GSSAPI_THR_LIBS}
+GSSAPI_THR_INC=${GLOBUS_THR_INC}
+GSSAPI_NOTHR_INC=${GLOBUS_GSSAPI_GSI_CFLAGS}
 endif
 
 LIBCARES_CFLAGS?=-I${cares_prefix}/include
@@ -120,7 +123,7 @@ ${GSS_STATICLIB}: ${GSS_OBJS}
        ranlib $@
 
 ${GSS_LTLIB}: ${GSS_OBJS}
-       ${LINK} ${version_info} -o $@ ${GSS_LOBJS} ${GLOBUS_NOTHR_LIBS} ${GSSAPI_NOTHR_LIBS} ${LIBCARES_LIBS}
+       ${LINK} ${version_info} -o $@ ${GSS_LOBJS} ${GSSAPI_NOTHR_LIBS} ${LIBCARES_LIBS}
 else
 ${GSS_NOTHRSTATICLIB}: ${GSS_OBJS}
        ar crv $@ ${GSS_OBJS}
@@ -131,10 +134,10 @@ ${GSS_THRSTATICLIB}: ${GSS_THROBJS}
        ranlib $@
 
 ${GSS_NOTHRLTLIB}: ${GSS_OBJS}
-       ${LINK} ${version_info} -o $@ ${GSS_LOBJS} ${GLOBUS_NOTHR_LIBS} ${GSSAPI_NOTHR_LIBS} ${LIBCARES_LIBS}
+       ${LINK} ${version_info} -o $@ ${GSS_LOBJS} ${GSSAPI_NOTHR_LIBS} ${LIBCARES_LIBS}
 
 ${GSS_THRLTLIB}: ${GSS_THROBJS}
-       ${LINK} ${version_info} -o $@ ${GSS_THRLOBJS} ${GLOBUS_THR_LIBS} ${GSSAPI_THR_LIBS} ${LIBCARES_LIBS}
+       ${LINK} ${version_info} -o $@ ${GSS_THRLOBJS} ${GSSAPI_THR_LIBS} ${LIBCARES_LIBS}
 endif
 
 
@@ -185,10 +188,10 @@ distclean:
        rm -rvf Makefile.inc *.spec debian/
 
 %.o: %.c
-       ${COMPILE} ${GLOBUS_NOTHR_INC} ${GSSAPI_NOTHR_INC} ${LIBCARES_CFLAGS} -o $@ -c $<
+       ${COMPILE} ${GSSAPI_NOTHR_INC} ${LIBCARES_CFLAGS} -o $@ -c $<
 
 %.thr.o: %.c
-       ${COMPILE} ${GLOBUS_THR_INC} ${GSSAPI_THR_INC} ${LIBCARES_CFLAGS} -o $@ -c $<
+       ${COMPILE} ${GSSAPI_THR_INC} ${LIBCARES_CFLAGS} -o $@ -c $<
 
 test_gss.o: %.o: %.cpp
        ${CXX} -c ${CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} ${CPPUNIT_CFLAGS} -Wno-error $<