From 44d04ad607da67f5af9aa2462ed7664df4dcab1b Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Tue, 14 Dec 2004 13:40:30 +0000 Subject: [PATCH] Daniel's Globus vs System OpenSSL patch --- org.gridsite.core/CHANGES | 3 +++ org.gridsite.core/project/configure.properties.xml | 4 +--- org.gridsite.core/src/Makefile | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES index e46eee6..30dd197 100644 --- a/org.gridsite.core/CHANGES +++ b/org.gridsite.core/CHANGES @@ -1,3 +1,6 @@ +* Tue Dec 14 2004 Andrew McNab +- Patch from Daniel Kouril to allow + switching Globus vs system OpenSSL libraries/headers. * Mon Nov 15 2004 Andrew McNab - Back out of (most of) redone VOMS support for committing to JRA1 CVS. diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml index c36f15e..19887fb 100644 --- a/org.gridsite.core/project/configure.properties.xml +++ b/org.gridsite.core/project/configure.properties.xml @@ -3,9 +3,7 @@ ====================================================== --> - + value="prefix=${stage.abs.dir} GSOAPDIR=${with.gsoap.prefix} OPENSSL_FLAGS=-I${with.globus.prefix}/include/gcc32 OPENSSL_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_EXT=_gcc32" /> diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index caff61c..5df145b 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -111,13 +111,13 @@ real-gridsite-admin.cgi: grst_admin_main.c grst_admin_gacl.c \ grst_admin_gacl.c \ grst_admin_file.c \ $(OPENSSL_FLAGS) -I/usr/kerberos/include \ - -DVERSION=\"$(VERSION)\" $(OPENSSL_LIBS) -lgridsite -lssl -lcrypto -lxml2 -lz -lm + -DVERSION=\"$(VERSION)\" $(OPENSSL_LIBS) -lgridsite -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lz -lm findproxyfile: findproxyfile.c libgridsite.a gcc -DVERSION=\"$(PATCH_VERSION)\" $(MYCFLAGS) $(MYLDFLAGS) \ -o findproxyfile findproxyfile.c -L. \ $(OPENSSL_FLAGS) -I/usr/kerberos/include -lgridsite \ - $(OPENSSL_LIBS) -lssl -lcrypto -lxml2 -lz -lm + $(OPENSSL_LIBS) -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lz -lm apidoc: doxygen Doxyfile @@ -125,7 +125,7 @@ apidoc: gaclexample: gaclexample.c libgridsite.a gcc -o gaclexample gaclexample.c -I. -L. \ $(OPENSSL_FLAGS) -I/usr/kerberos/include -lgridsite \ - -lssl -lcrypto -lxml2 -lz -lm + -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lz -lm # # Delegation machinery, including SOAP delegation portType. To build this @@ -152,7 +152,7 @@ gridsite-delegation.cgi: grst-delegation.c delegation.h delegation.wsdl \ $(OPENSSL_FLAGS) -I/usr/kerberos/include -I$(GSOAPDIR)/include \ -DVERSION=\"$(VERSION)\" -L$(GSOAPDIR)/lib \ soapC.c soapServer.c -lgsoap \ - -lgridsite -lcurl -lz -lssl -lcrypto -lxml2 -lm + -lgridsite -lcurl -lz -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lm htproxyput: htproxyput.c delegation.h delegation.wsdl \ soapC.c soapServer.c @@ -162,7 +162,7 @@ htproxyput: htproxyput.c delegation.h delegation.wsdl \ -g -DVERSION=\"$(VERSION)\" \ -I$(GSOAPDIR)/include -DWITH_OPENSSL -L$(GSOAPDIR)/lib \ soapC.c soapClient.c -lgsoap \ - -lgridsite -lcurl -lz -lssl -lcrypto -lxml2 -lm + -lgridsite -lcurl -lz -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lm proxyput-example: proxyput-example.c delegation.h delegation.wsdl \ soapC.c soapServer.c libstdsoap2.a @@ -172,7 +172,7 @@ proxyput-example: proxyput-example.c delegation.h delegation.wsdl \ -g -DVERSION=\"$(VERSION)\" \ -I$(GSOAPDIR) -DWITH_OPENSSL \ soapC.c soapClient.c libstdsoap2.a \ - -lgridsite -lcurl -lz -lssl -lcrypto -lxml2 -lm + -lgridsite -lcurl -lz -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lm clean: -- 1.8.2.3