Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > e9f07e2d7fd0216b9d08e9f4ead1a070 > files > 2

CGSI-gSOAP-1.3.5-2.fc15.src.rpm

diff -ur CGSI-gSOAP-1.3.4.2.orig/src/Makefile CGSI-gSOAP-1.3.4.2/src/Makefile
--- CGSI-gSOAP-1.3.4.2.orig/src/Makefile	2011-06-10 08:35:48.000000000 +0200
+++ CGSI-gSOAP-1.3.4.2/src/Makefile	2012-02-20 19:51:31.690872909 +0100
@@ -66,7 +66,12 @@
 
 ifneq ($(WITH_EMI), $(EMPTY))
 GLOBUS_INCLUDE = -I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(LIBDIR)/globus/include
-GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) -lglobus_gssapi_gsi -lglobus_gss_assist
+GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) \
+	-lglobus_gss_assist \
+	-lglobus_gssapi_gsi \
+	-lglobus_gsi_credential \
+	-lglobus_gsi_cert_utils \
+	-lglobus_common -lcrypto
 
 ifneq ($(USE_VOMS), $(EMPTY))
 LIBFILES +=libcgsi_plugin_voms$(GSOAP_VERSION).a
@@ -79,11 +79,19 @@
 else
 GLOBUS_INCLUDE = -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR)
-GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) \
-	-lglobus_gss_assist_$(GLOBUS_FLAVOUR)
+GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) \
+	-lglobus_gss_assist_$(GLOBUS_FLAVOUR) \
+	-lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) \
+	-lglobus_gsi_credential_$(GLOBUS_FLAVOUR) \
+	-lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR) \
+	-lglobus_common_$(GLOBUS_FLAVOUR) -lcrypto
 
 GLOBUS_INCLUDE_PTHR = -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_PTHR)
-GLOBUS_LIBS_PTHR = -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_PTHR) \
-        -lglobus_gss_assist_$(GLOBUS_FLAVOUR_PTHR)
+GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) \
+	-lglobus_gss_assist_$(GLOBUS_FLAVOUR_PTHR) \
+	-lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_PTHR) \
+	-lglobus_gsi_credential_$(GLOBUS_FLAVOUR_PTHR) \
+	-lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR_PTHR) \
+	-lglobus_common_$(GLOBUS_FLAVOUR_PTHR) -lcrypto
 
 ifneq ($(USE_VOMS), $(EMPTY))
 LIBFILES += libcgsi_plugin_voms$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR).a