From: Jiří Škrábal <nykolas@ics.muni.cz>
Date: Fri, 13 May 2005 13:53:53 +0000 (+0000)
Subject: - gsoap version checking in the source code is disabled by default
X-Git-Tag: glite-security-gsoap-plugin_R_1_1_1~22
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d67bd95b6640e42bfac9127bd85302c30892cd9c;p=jra1mw.git

- gsoap version checking in the source code is disabled by default
- can be switched on by setting gsplugin.version.checking=yes in
  ~/glite.build.properties configuration file
---

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 68cb406..f01a3e8 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -14,6 +14,7 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 gsoap_prefix=/opt/gsoap
+gsplugin_version_checking=yes
 
 CC=gcc
 
@@ -21,7 +22,6 @@ CC=gcc
 -include ../Makefile.inc
 
 GSPLUGIN_DEBUG?=no
-GSPLUGIN_VERSION_CHECKING?=yes
 
 version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`
 
@@ -30,7 +30,7 @@ VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples
 TEST_LIBS:=-L${cppunit}/lib -lcppunit
 TEST_INC:=-I${cppunit}/include
 
-ifeq ($(GSPLUGIN_DEBUG),yes)
+ifeq ($(gsplugin_version_checking),yes)
 	DEBUG:=-g -O0 -Wall -DGSPLUGIN_DEBUG
 else
 	DEBUG:=-g -O0 -Wall
@@ -123,6 +123,10 @@ default: all
 
 all compile: ${GSS_STATICLIB} ${GSS_LTLIB} ${GSS_THRSTATICLIB} ${GSS_THRLTLIB} ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB} examples
 
+v: 
+	echo "check: ${CHECK_GSOAP_VERSION}"
+	echo "DEBUG: ${DEBUG}"
+
 check: compile check.gss
 
 check.gss: test_gss
diff --git a/org.glite.security.gsoap-plugin/project/configure.properties.xml b/org.glite.security.gsoap-plugin/project/configure.properties.xml
index 466bbe2..7b9f931 100644
--- a/org.glite.security.gsoap-plugin/project/configure.properties.xml
+++ b/org.glite.security.gsoap-plugin/project/configure.properties.xml
@@ -45,6 +45,7 @@ thrflavour=${with.globus.thr.flavor}
 nothrflavour=${with.globus.nothr.flavor}
 cppunit=${with.cppunit.prefix}
 gsoap_prefix=${with.gsoap.prefix}
+gsplugin_version_checking=${gsplugin.version.checking}
 			</echo>
 	    </target>
 	</project>
diff --git a/org.glite.security.gsoap-plugin/project/version.properties b/org.glite.security.gsoap-plugin/project/version.properties
index 08e9de3..52a743f 100644
--- a/org.glite.security.gsoap-plugin/project/version.properties
+++ b/org.glite.security.gsoap-plugin/project/version.properties
@@ -1,2 +1,2 @@
-module.version=1.1.0
+module.version=1.1.1
 module.age=0
diff --git a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
index 17cacc5..c2c8dad 100644
--- a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
+++ b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
@@ -211,6 +211,8 @@ glite_gsplugin_connect(
 		fprintf(stderr, "Client connect will work only with gSOAP v2.7.0e and later");
 		return ENOSYS;
 	}
+#else
+# warn "gSOAP version checking is switched off!"
 #endif
 
 	ctx = ((int_plugin_data_t *)soap_lookup_plugin(soap, plugin_id))->ctx;