Build with letter-less gsoap versions (2.7.10).

diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile
index 6a63cea..ce2b8f0 100644 (file)
--- a/org.glite.jp.index/Makefile
+++ b/org.glite.jp.index/Makefile
@@ -147,7 +147,7 @@ soap_ops.o bones_server.o: soap_version.h
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z])?.*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''".($$4?$$4:"\\0")."'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 
 db_ops.h: context.h

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index 329f2ec..6c53b25 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -216,7 +216,7 @@ soap_ops.o bones_server.o: soap_version.h
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z])?.*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''".($$4?$$4:"\\0")."'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp 
 
 soap_env_ctx.c soap_env_ctx.h soap_switch.c: env_C.c mk_soap_switch.pl

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index bab9069..52ffc7c 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -418,7 +418,7 @@ test_query_events.o: %.o: %.cpp
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]?).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''".($$4?$$4:"\\0")."'\''\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 
 ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)