From c04404754b0dde5cfb12fae1833ce835296f30dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20=C5=A0kr=C3=A1bal?= Date: Tue, 26 Apr 2005 10:29:46 +0000 Subject: [PATCH] - GSPLUGIN_VERSION_CHECKING environment variable could switch the runtime gsoap version checking on/off --- org.glite.security.gsoap-plugin/Makefile | 7 ++++++- org.glite.security.gsoap-plugin/src/glite_gsplugin.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile index 089c348..e1caf26 100644 --- a/org.glite.security.gsoap-plugin/Makefile +++ b/org.glite.security.gsoap-plugin/Makefile @@ -20,7 +20,8 @@ CC=gcc -include Makefile.inc -include ../Makefile.inc -GSPLUGIN_DEBUG:= +GSPLUGIN_DEBUG?=no +GSPLUGIN_VERSION_CHECKING?=yes version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` @@ -35,6 +36,10 @@ else DEBUG:=-g -O0 -Wall endif +ifeq ($(GSPLUGIN_VERSION_CHECKING),yes) + DEBUG:=${DEBUG} -DCHECK_GSOAP_VERSION +endif + CFLAGS:= ${DEBUG} \ -DVERSION=\"${version}\" \ -I${top_srcdir}/src -I${top_srcdir}/interface -I. \ diff --git a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c index bcda7d6..17cacc5 100644 --- a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c +++ b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c @@ -204,7 +204,7 @@ glite_gsplugin_connect( pdprintf(("GSLITE_GSPLUGIN: glite_gsplugin_connect()\n")); -#if GSOAP_VERSION <= 20700 +#if defined(CHECK_GSOAP_VERSION) && GSOAP_VERSION <= 20700 if ( GSOAP_VERSION < 20700 || (GSOAP_VERSION == 20700 && (strlen(GSOAP_MIN_VERSION) < 1 || GSOAP_MIN_VERSION[1] < 'e')) ) { -- 1.8.2.3