merge from LB 1.9 (merge_313_7_src)

diff --git a/org.glite.lb.types/Makefile b/org.glite.lb.types/Makefile
index 22cf109..5e05b1d 100644 (file)
--- a/org.glite.lb.types/Makefile
+++ b/org.glite.lb.types/Makefile
@@ -12,7 +12,8 @@ default: compile
 compile: at3
 
 at3: at3.in
-       sed "s?%PREFIX%?${stagedir}?" at3.in >$@
+       #XXX: sed "s?%PREFIX%?${stagedir}?" at3.in >$@
+       cp at3.in $@
 
 stage: compile
        $(MAKE) install PREFIX=${stagedir}

diff --git a/org.glite.lb.types/at3.in b/org.glite.lb.types/at3.in
index 544b4c5..4711999 100755 (executable)
--- a/org.glite.lb.types/at3.in
+++ b/org.glite.lb.types/at3.in
@@ -5,7 +5,9 @@ use File::Basename;
 my $lines = $ENV{AT3_LINES};
 
 my $prefix;
-BEGIN{ $prefix = '%PREFIX%'; }
+use File::Basename;
+
+BEGIN{ $prefix = dirname($0)."/.."; }
 
 use lib "$prefix/share/perl";
 use gLite::LB::MultiStruct;

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index 3f70817..7b2b5a7 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -36,7 +36,10 @@ INSTALL:=libtool --mode=install install
 
 GSOAP_FILES_PREFIX:= bk_ws_
 dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . }
-GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}
+ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+       langflavour:=_c
+endif
+GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 
 WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o
 # ws_typeref.o
@@ -76,6 +79,6 @@ LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl
 
 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