diff -ur lcgdm-1.8.1.2.orig/dicomcopy/Imakefile lcgdm-1.8.1.2/dicomcopy/Imakefile --- lcgdm-1.8.1.2.orig/dicomcopy/Imakefile 2011-09-03 11:19:24.694163404 +0200 +++ lcgdm-1.8.1.2/dicomcopy/Imakefile 2011-09-03 11:20:10.776557224 +0200 @@ -12,7 +12,7 @@ #if UseGSI GLOBUS_LOCATION=GlobusLocation #if EMIBuild -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist #else GLOBUS_FLAVOUR=GlobusFlavour GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) -lglobus_gss_assist_$(GLOBUS_FLAVOUR) diff -ur lcgdm-1.8.1.2.orig/dpm/Imakefile lcgdm-1.8.1.2/dpm/Imakefile --- lcgdm-1.8.1.2.orig/dpm/Imakefile 2011-09-03 11:19:24.695163391 +0200 +++ lcgdm-1.8.1.2/dpm/Imakefile 2011-09-03 11:20:10.777557211 +0200 @@ -24,7 +24,7 @@ #if UseGSI GLOBUS_LOCATION=GlobusLocation #if EMIBuild -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common #else #if defined(__STDC__) GLOBUS_FLAVOUR=GlobusFlavour##pthr diff -ur lcgdm-1.8.1.2.orig/dpmcopy/Imakefile lcgdm-1.8.1.2/dpmcopy/Imakefile --- lcgdm-1.8.1.2.orig/dpmcopy/Imakefile 2011-09-03 11:19:24.696163378 +0200 +++ lcgdm-1.8.1.2/dpmcopy/Imakefile 2011-09-03 11:20:10.778557198 +0200 @@ -26,13 +26,13 @@ GLOBUS_LOCATION=GlobusLocation #if EMIBuild GLOBUS_INCLUDES=-I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common -GGC_LIB=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gass_copy -lglobus_ftp_client -lglobus_common +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_common +GGC_LIB=-lglobus_gass_copy -lglobus_ftp_client -lglobus_common #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(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 SOAPLIB = -lgsoap #else diff -ur lcgdm-1.8.1.2.orig/ns/Imakefile lcgdm-1.8.1.2/ns/Imakefile --- lcgdm-1.8.1.2.orig/ns/Imakefile 2011-09-03 11:19:24.697163365 +0200 +++ lcgdm-1.8.1.2/ns/Imakefile 2011-09-03 11:20:10.778557198 +0200 @@ -23,7 +23,7 @@ #if UseGSI GLOBUS_LOCATION=GlobusLocation #if EMIBuild -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist #else #if defined(__STDC__) GLOBUS_FLAVOUR=GlobusFlavour##pthr diff -ur lcgdm-1.8.1.2.orig/security/Imakefile lcgdm-1.8.1.2/security/Imakefile --- lcgdm-1.8.1.2.orig/security/Imakefile 2011-09-03 11:19:24.700163326 +0200 +++ lcgdm-1.8.1.2/security/Imakefile 2011-09-03 11:20:10.779557185 +0200 @@ -36,7 +36,7 @@ #if EMIBuild #if UseVOMS VOMS_INCLUDE=-I$(VOMS_LOCATION)/include/voms -DUSE_VOMS -VOMS_LIB=-L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi +VOMS_LIB=-lvomsapi #endif #else GLOBUS_FLAVOUR_NONPTHR=GlobusFlavour @@ -57,7 +57,7 @@ #define SecAuthMechGSI -DGSI #if EMIBuild #define SecIncludeDirGSI -I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(_lib)/globus/include $(VOMS_INCLUDE) -#define SecLibsGSI -L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_gsi_cert_utils -lglobus_common $(VOMS_LIB) -lssl -lcrypto +#define SecLibsGSI -lglobus_gssapi_gsi -lglobus_gss_assist -lglobus_gsi_credential -lglobus_gsi_callback -lglobus_gsi_cert_utils -lglobus_common $(VOMS_LIB) -lssl -lcrypto #else #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_gsi_cert_utils_$(GLOBUS_FLAVOUR_NONPTHR) -lglobus_common_$(GLOBUS_FLAVOUR_NONPTHR) $(VOMS_LIB) -lssl -lcrypto diff -ur lcgdm-1.8.1.2.orig/srmv1/Imakefile lcgdm-1.8.1.2/srmv1/Imakefile --- lcgdm-1.8.1.2.orig/srmv1/Imakefile 2011-09-03 11:19:24.701163313 +0200 +++ lcgdm-1.8.1.2/srmv1/Imakefile 2011-09-03 11:20:10.779557186 +0200 @@ -25,12 +25,12 @@ CGSI_GSOAP_LOCATION=CgsiGsoapLocation GLOBUS_LOCATION=GlobusLocation #if EMIBuild -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(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 SOAPLIB = -lgsoap #else diff -ur lcgdm-1.8.1.2.orig/srmv2/Imakefile lcgdm-1.8.1.2/srmv2/Imakefile --- lcgdm-1.8.1.2.orig/srmv2/Imakefile 2011-09-03 11:19:24.702163300 +0200 +++ lcgdm-1.8.1.2/srmv2/Imakefile 2011-09-03 11:20:10.780557172 +0200 @@ -25,12 +25,12 @@ CGSI_GSOAP_LOCATION=CgsiGsoapLocation GLOBUS_LOCATION=GlobusLocation #if EMIBuild -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(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 SOAPLIB = -lgsoap #else diff -ur lcgdm-1.8.1.2.orig/srmv2.2/Imakefile lcgdm-1.8.1.2/srmv2.2/Imakefile --- lcgdm-1.8.1.2.orig/srmv2.2/Imakefile 2011-09-03 11:19:24.703163286 +0200 +++ lcgdm-1.8.1.2/srmv2.2/Imakefile 2011-09-03 11:20:10.780557172 +0200 @@ -25,12 +25,12 @@ CGSI_GSOAP_LOCATION=CgsiGsoapLocation GLOBUS_LOCATION=GlobusLocation #if EMIBuild -GLOBUS_LIBS=-L$(GLOBUS_LOCATION)/$(_lib) -lglobus_gssapi_gsi -lglobus_gss_assist +GLOBUS_LIBS=-lglobus_gssapi_gsi -lglobus_gss_assist #if UseVOMS -VOMS_LIB = -L$(VOMS_LOCATION)/$(_lib) -L$(VOMS_LOCATION)/lib -lvomsapi -SECLIB = -L$(CGSI_GSOAP_LOCATION)/$(_lib) -L$(CGSI_GSOAP_LOCATION)/lib -lcgsi_plugin_voms_gsoap_$(GSOAP_VERSION) $(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 SOAPLIB = -lgsoap #else