Merged from RC31_3 to solve problems with compilation with gcc 4.1 and libclassad...

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index f36af09..e83cef9 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -12,7 +12,6 @@ PREFIX=/opt/glite
 glite_location=/opt/glite
 nothrflavour=gcc32
 thrflavour=gcc32pthr
-expat_prefix=/opt/expat
 gsoap_prefix=/software/gsoap-2.6
 
 CC=gcc
@@ -22,8 +21,15 @@ CC=gcc
 
 VPATH=${top_srcdir}/src:${top_srcdir}/examples:${top_srcdir}/test:${top_srcdir}/project:${stagedir}/interface
 
+archlib:=lib
+host_cpu:=${shell uname -m}
+ifeq (${host_cpu},x86_64) 
+    archlib:=lib64
+endif   
+
+
 ifneq (${classads_prefix},/usr)
-        classadslib := -L${classads_prefix}/lib -lclassad
+        classadslib := -L${classads_prefix}/${archlib} -lclassad
 endif
 
 CLASSADPLUGIN_LIBS:= ${classadslib} -lstdc++ 
@@ -41,10 +47,6 @@ SOLINK:=libtool --mode=link ${CC} -module ${LDFLAGS} -rpath ${stagedir}/lib
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
-ifneq (${classads_prefix},/usr)
-       classadslib := -L${classads_prefix}/lib -lclassad
-endif
-
 daemon:=glite-jp-primarystoraged
 example:=jpps-test dag-deps
 ps_prefix:=jpps_
@@ -83,12 +85,6 @@ TRIOLIB:=-lglite_jp_trio
 LIBTARLIB:=-L${libtar_prefix}/lib -ltar
 GSSLIB:=-lglite_security_gss_${nothrflavour}
 
-archlib:=lib
-host_cpu:=${shell uname -m}
-ifeq (${host_cpu},x86_64) 
-    archlib:=lib64
-endif   
-
 ifneq (${mysql_prefix},/usr)
        ifeq ($(shell test -f ${mysql_prefix}/${archlib}/libmysqlclient.a -o -f ${mysql_prefix}/${archlib}/libmysqlclient.so && echo ok),ok)
                MYSQLIB := -L${mysql_prefix}/${archlib} -lmysqlclient -lz

diff --git a/org.glite.jp.primary/src/is_client.c b/org.glite.jp.primary/src/is_client.c
index 9c11052..f35a1bb 100644 (file)
--- a/org.glite.jp.primary/src/is_client.c
+++ b/org.glite.jp.primary/src/is_client.c
@@ -4,12 +4,12 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <stdsoap2.h>
-
 
 #undef SOAP_FMAC1
 #define SOAP_FMAC1 static
 
+#include <stdsoap2.h>
+
 #include "glite/jp/types.h"
 #include "soap_version.h"
 #include "glite/security/glite_gsplugin.h"

diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c
index e4dd2c2..92cc8f2 100644 (file)
--- a/org.glite.jp.primary/src/soap_ops.c
+++ b/org.glite.jp.primary/src/soap_ops.c
@@ -1,11 +1,12 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <stdsoap2.h>
 
 #undef SOAP_FMAC1
 #define SOAP_FMAC1     static
 
+#include <stdsoap2.h>
+
 #include "glite/jp/types.h"
 #include "glite/jp/context.h"
 #include "glite/jp/attr.h"

diff --git a/org.glite.jp.primary/src/tags.c b/org.glite.jp.primary/src/tags.c
index 1d4f4ae..f7a2896 100644 (file)
--- a/org.glite.jp.primary/src/tags.c
+++ b/org.glite.jp.primary/src/tags.c
@@ -16,6 +16,7 @@
 #define HEADER_SIZE 48
 #define TAGS_MAGIC 0x74c016f2   /* two middle digits encode version, i.e. 01 */
 
+static int tagsread(void *fpctx,struct tags_handle *h);
 
 /*int glite_jpps_tag_append(
        glite_jp_context_t ctx,