diff -ur LCG-DM-1.7.3.1.orig/dicomcopy/Imakefile LCG-DM-1.7.3.1/dicomcopy/Imakefile --- LCG-DM-1.7.3.1.orig/dicomcopy/Imakefile 2009-09-24 11:39:03.731117679 +0200 +++ LCG-DM-1.7.3.1/dicomcopy/Imakefile 2009-09-24 11:39:46.617121785 +0200 @@ -12,7 +12,7 @@ #if UseGSI GLOBUS_LOCATION=GlobusLocation GLOBUS_FLAVOUR=GlobusFlavour -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist LIBCSEC += $(GLOBUS_LIBS) #endif #if UseVirtualIds diff -ur LCG-DM-1.7.3.1.orig/dli/Imakefile LCG-DM-1.7.3.1/dli/Imakefile --- LCG-DM-1.7.3.1.orig/dli/Imakefile 2009-09-24 11:39:03.732119266 +0200 +++ LCG-DM-1.7.3.1/dli/Imakefile 2009-09-24 11:39:46.618118396 +0200 @@ -13,7 +13,7 @@ #else GLOBUS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags @@ -31,7 +31,7 @@ DFLAGS = -DLOGFILE=\"$(LOGFILE)\" $(SOAPFLG) -CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(VOMS_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) +CFLAGS = -g -I$(INCLUDES) -I$(VOMS_LOCATION)/include/voms $(MTCCFLAGS) $(DFLAGS) COMM######################### RULES ############################## diff -ur LCG-DM-1.7.3.1.orig/dpm/Imakefile LCG-DM-1.7.3.1/dpm/Imakefile --- LCG-DM-1.7.3.1.orig/dpm/Imakefile 2009-09-24 11:39:03.733118892 +0200 +++ LCG-DM-1.7.3.1/dpm/Imakefile 2009-09-24 11:39:46.619119351 +0200 @@ -27,8 +27,8 @@ #else GLOBUS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) -GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common +GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common LIBCSEC += $(GLOBUS_LIBS) #endif LIBCSEC += -ldl @@ -301,7 +301,7 @@ all: $(CLIENT) $(SERVER) $(DPM_IFCE) dpm_copyfile.o: dpm_copyfile.c - $(CC) $(CFLAGS) -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) -c dpm_copyfile.c + $(CC) $(CFLAGS) -I/usr/include/globus -I/usr/$(_lib)/globus/include -c dpm_copyfile.c dicomcopy_libpq_ifce.c: DepSourceName(dicomcopy,dicomcopy_libpq_ifce.c) RemoveFile(dicomcopy_libpq_ifce.c) diff -ur LCG-DM-1.7.3.1.orig/dpmcopy/Imakefile LCG-DM-1.7.3.1/dpmcopy/Imakefile --- LCG-DM-1.7.3.1.orig/dpmcopy/Imakefile 2009-09-24 11:39:26.762119985 +0200 +++ LCG-DM-1.7.3.1/dpmcopy/Imakefile 2009-09-24 11:40:25.107118597 +0200 @@ -22,17 +22,17 @@ GLOBUS_LOCATION=GlobusLocation GLOBUS_FLAVOUR=GlobusFlavour VOMS_FLAVOUR=GlobusFlavour -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) -GGC_LIB=-lglobus_gass_copy_$(GLOBUS_FLAVOUR) -lglobus_ftp_client_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common +GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR) -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS) +VOMS_LIB = -lvomsapi +SECLIB = -lcgsi_plugin_voms #else -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin #endif SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) @@ -69,7 +69,7 @@ -DLOGFILE=\"$(LOGFILE)\" \ $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG) -CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) +CFLAGS = -g -I$(INCLUDES) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) COMM######################### DEPENDENCY LIBRARIES ############### @@ -124,7 +124,7 @@ $(GSOAP_LOCATION)/bin/wsdl2h $(WSDL2H_FLAGS) -c -e -y -t typemap.dat srm.v2.2.wsdl dpm_copyfile.Osuf: dpm_copyfile.c - $(CC) $(CFLAGS) -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) -c dpm_copyfile.c + $(CC) $(CFLAGS) -I/usr/include/globus -I/usr/$(_lib)/globus/include -c dpm_copyfile.c dpmcopy_inc_reqctr.Osuf: dpmcopy_inc_reqctr.c $(CC) -c -g -I$(INCLUDES) $(MTCCFLAGS) $(CSECFLAG) dpmcopy_inc_reqctr.c send2dpmcopyd.Osuf: send2dpmcopyd.c diff -ur LCG-DM-1.7.3.1.orig/ns/Imakefile LCG-DM-1.7.3.1/ns/Imakefile --- LCG-DM-1.7.3.1.orig/ns/Imakefile 2009-09-24 11:38:54.638117192 +0200 +++ LCG-DM-1.7.3.1/ns/Imakefile 2009-09-24 11:39:46.622118368 +0200 @@ -22,7 +22,7 @@ #else GLOBUS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist LIBCSEC += $(GLOBUS_LIBS) #endif LIBCSEC += -ldl diff -ur LCG-DM-1.7.3.1.orig/security/Imakefile LCG-DM-1.7.3.1/security/Imakefile --- LCG-DM-1.7.3.1.orig/security/Imakefile 2009-09-24 11:38:50.587119335 +0200 +++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-24 11:39:46.637118113 +0200 @@ -43,15 +43,15 @@ VOMS_FLAVOUR=GlobusFlavour/**/pthr #endif #if UseVOMS -VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/glite/security/voms -DUSE_VOMS -VOMS_LIB=-L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR) +VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/voms -DUSE_VOMS +VOMS_LIB=-lvomsapi #endif #define GSIMech GSI #define SecAuthMechGSI -DGSI -#define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_INCLUDE) -#define SecLibsGSI -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto -#define SecIncludeDirGSIpthr -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR) $(VOMS_INCLUDE) -#define SecLibsGSIpthr -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -lglobus_gsi_credential_$(GLOBUS_FLAVOUR) -lglobus_gsi_callback_$(GLOBUS_FLAVOUR) -lglobus_common_$(GLOBUS_FLAVOUR) $(VOMS_LIB) -lssl -lcrypto +#define SecIncludeDirGSI -I/usr/include/globus -I/usr/$(_lib)/globus/include -I/usr/kerberos/include $(VOMS_INCLUDE) +#define SecLibsGSI -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_common $(VOMS_LIB) -lssl -lcrypto +#define SecIncludeDirGSIpthr -I/usr/include/globus -I/usr/$(_lib)/globus/include -I/usr/kerberos/include $(VOMS_INCLUDE) +#define SecLibsGSIpthr -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_common $(VOMS_LIB) -lssl -lcrypto #else #define GSIMech #endif diff -ur LCG-DM-1.7.3.1.orig/socket/dpmcli/module.mk LCG-DM-1.7.3.1/socket/dpmcli/module.mk --- LCG-DM-1.7.3.1.orig/socket/dpmcli/module.mk 2009-09-24 11:38:54.640119152 +0200 +++ LCG-DM-1.7.3.1/socket/dpmcli/module.mk 2009-09-24 11:39:46.637118113 +0200 @@ -80,8 +80,8 @@ GLOBUS_FLAVOUR=gcc32dbgpthr -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) -GGC_LIB=-L$(GLOBUS_LOCATION)/lib -lglobus_gass_copy_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist +GGC_LIB=-lglobus_gass_copy CSECFLAG = -DCSEC LIBCSEC += $(GLOBUS_LIBS) diff -ur LCG-DM-1.7.3.1.orig/srmv1/Imakefile LCG-DM-1.7.3.1/srmv1/Imakefile --- LCG-DM-1.7.3.1.orig/srmv1/Imakefile 2009-09-24 11:39:03.741119734 +0200 +++ LCG-DM-1.7.3.1/srmv1/Imakefile 2009-09-24 11:40:48.437118837 +0200 @@ -27,16 +27,16 @@ GLOBUS_FLAVOUR=GlobusFlavour/**/pthr VOMS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR) -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS) +VOMS_LIB = -lvomsapi +SECLIB = -lcgsi_plugin_voms #else -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin #endif SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) @@ -76,7 +76,7 @@ -DLOGFILE=\"$(LOGFILE)\" \ $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG) -CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) +CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) COMM######################### DEPENDENCY LIBRARIES ############### diff -ur LCG-DM-1.7.3.1.orig/srmv2/Imakefile LCG-DM-1.7.3.1/srmv2/Imakefile --- LCG-DM-1.7.3.1.orig/srmv2/Imakefile 2009-09-24 11:39:03.742120361 +0200 +++ LCG-DM-1.7.3.1/srmv2/Imakefile 2009-09-24 11:41:08.123118066 +0200 @@ -27,16 +27,16 @@ GLOBUS_FLAVOUR=GlobusFlavour/**/pthr VOMS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR) -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS) +VOMS_LIB = -lvomsapi +SECLIB = -lcgsi_plugin_voms #else -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin #endif SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) @@ -76,7 +76,7 @@ -DLOGFILE=\"$(LOGFILE)\" \ $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG) -CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) +CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) COMM######################### DEPENDENCY LIBRARIES ############### diff -ur LCG-DM-1.7.3.1.orig/srmv2.2/Imakefile LCG-DM-1.7.3.1/srmv2.2/Imakefile --- LCG-DM-1.7.3.1.orig/srmv2.2/Imakefile 2009-09-24 11:39:03.742120361 +0200 +++ LCG-DM-1.7.3.1/srmv2.2/Imakefile 2009-09-24 11:41:46.008118414 +0200 @@ -27,16 +27,16 @@ GLOBUS_FLAVOUR=GlobusFlavour/**/pthr VOMS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi_$(VOMS_FLAVOUR) -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR) $(VOMS_LIB) $(GLOBUS_LIBS) +VOMS_LIB = -lvomsapi +SECLIB = -lcgsi_plugin_voms #else -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin #endif SOAPFLG = -DWITH_IPV6 INCLUDES = FileName(..,h) @@ -77,7 +77,7 @@ -DLOGFILE=\"$(LOGFILE)\" \ $(ORAFLG) $(MYSFLG) $(POSFLG) $(CSECFLAG) $(VIDFLAG) $(VOMSFLAG) $(SOAPFLG) -CFLAGS = -g -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) +CFLAGS = -g -I$(INCLUDES) $(MTCCFLAGS) $(DFLAGS) $(ORAINC) $(MYSINC) $(POSINC) COMM######################### DEPENDENCY LIBRARIES ############### diff -ur LCG-DM-1.7.3.1.orig/test/srmv1/Imakefile LCG-DM-1.7.3.1/test/srmv1/Imakefile --- LCG-DM-1.7.3.1.orig/test/srmv1/Imakefile 2009-09-24 11:38:58.823117551 +0200 +++ LCG-DM-1.7.3.1/test/srmv1/Imakefile 2009-09-24 11:39:46.645117549 +0200 @@ -13,13 +13,13 @@ #else GLOBUS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation SECFLG = -DGFAL_SECURE -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin SOAPFLG = -DWITH_IPV6 RFIOFLG = -DGFAL_ENABLE_RFIO @@ -29,7 +29,7 @@ COMM######################### FLAGS ############################## -CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include +CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) COMM######################### RULES ############################## diff -ur LCG-DM-1.7.3.1.orig/test/srmv2/Imakefile LCG-DM-1.7.3.1/test/srmv2/Imakefile --- LCG-DM-1.7.3.1.orig/test/srmv2/Imakefile 2009-09-24 11:38:58.823117551 +0200 +++ LCG-DM-1.7.3.1/test/srmv2/Imakefile 2009-09-24 11:39:46.646117565 +0200 @@ -13,13 +13,13 @@ #else GLOBUS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation SECFLG = -DGFAL_SECURE -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin SOAPFLG = -DWITH_IPV6 RFIOFLG = -DGFAL_ENABLE_RFIO @@ -29,7 +29,7 @@ COMM######################### FLAGS ############################## -CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAP_FLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include +CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAP_FLG) -I$(INCLUDES) COMM######################### RULES ############################## diff -ur LCG-DM-1.7.3.1.orig/test/srmv2.2/Imakefile LCG-DM-1.7.3.1/test/srmv2.2/Imakefile --- LCG-DM-1.7.3.1.orig/test/srmv2.2/Imakefile 2009-09-24 11:38:58.824119466 +0200 +++ LCG-DM-1.7.3.1/test/srmv2.2/Imakefile 2009-09-24 11:39:46.647117997 +0200 @@ -13,13 +13,13 @@ #else GLOBUS_FLAVOUR=GlobusFlavour/**/pthr #endif -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist GSOAP_LOCATION=GsoapLocation GSOAP_VERSION=GsoapVersion WSDL2H_FLAGS=GsoapWsdl2hFlags CGSI_GSOAP_LOCATION=CgsiGsoapLocation SECFLG = -DGFAL_SECURE -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -lcgsi_plugin_gsoap_$(GSOAP_VERSION) $(GLOBUS_LIBS) +SECLIB = -lcgsi_plugin SOAPFLG = -DWITH_IPV6 RFIOFLG = -DGFAL_ENABLE_RFIO @@ -29,7 +29,7 @@ COMM######################### FLAGS ############################## -CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) -I$(GSOAP_LOCATION)/include -I$(CGSI_GSOAP_LOCATION)/include +CFLAGS = $(SECFLG) $(RFIOFLG) $(SOAPFLG) -I$(INCLUDES) COMM######################### RULES ##############################