From 996e78fb21936d08ea62d7a9dd638917768ae0e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Mon, 25 Apr 2005 15:26:41 +0000 Subject: [PATCH] change the gsoap version detection to work also with 2.7.1 --- org.glite.security.gsoap-plugin/Makefile | 13 ++++++++----- org.glite.security.gsoap-plugin/src/glite_gsplugin.c | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile index a772776..089c348 100644 --- a/org.glite.security.gsoap-plugin/Makefile +++ b/org.glite.security.gsoap-plugin/Makefile @@ -24,9 +24,6 @@ GSPLUGIN_DEBUG:= version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` -gsoap_version=`${gsoap_prefix}/bin/soapcpp2 -version 2>&1 | cut -d' ' -f4 | perl -F\\\\. -nae '$$F[2] =~ s/\D*$$//; print $$F[2]+100*$$F[1]+10000*$$F[0]'` -gsoap_min_version=`${gsoap_prefix}/bin/soapcpp2 -version 2>&1 | cut -d' ' -f4 | cut -d'.' -f3` - VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples TEST_LIBS:=-L${cppunit}/lib -lcppunit @@ -40,8 +37,6 @@ endif CFLAGS:= ${DEBUG} \ -DVERSION=\"${version}\" \ - -DGSOAP_VERSION=${gsoap_version} \ - -DGSOAP_MIN_VERSION=\"${gsoap_min_version}\" \ -I${top_srcdir}/src -I${top_srcdir}/interface -I. \ -I${stagedir}/include \ -I${gsoap_prefix}/include \ @@ -211,3 +206,11 @@ clean: test_gss.o: %.o: %.cpp ${CXX} -c ${CFLAGS} ${GLOBUSINC} ${TEST_INC} $< + +soap_version.h: + ${gsoap_prefix}/bin/soapcpp2 /dev/null + perl -ne '$$. == 2 && /.*([0-9])\.([0-9])\.(\S+)\s.*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_MIN_VERSION \"$$3\"\n",$$1,$$2,$$3' soapH.h >$@ + -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp + +glite_gsplugin.o: soap_version.h + diff --git a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c index ff6d0f7..bcda7d6 100644 --- a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c +++ b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c @@ -3,6 +3,7 @@ #include #include +#include "soap_version.h" #include "glite_gsplugin.h" #ifdef GSPLUGIN_DEBUG -- 1.8.2.3