Build fixes: LB, 64 bit JP.

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index 7ce8e87..c4e7949 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -35,7 +35,7 @@ endif
 
 
 ifneq (${classads_prefix},/usr)
-        classadslib := -L${classads_prefix}/${archlib} -lclassad
+        classadslib := -L${classads_prefix}/${archlib} -L${classads_prefix}/lib -lclassad
 endif
 
 CLASSADPLUGIN_LIBS:= ${classadslib} -lstdc++ 
@@ -46,7 +46,7 @@ GLOBUS_CFLAGS:=-I${globus_prefix}/include/${nothrflavour}
 
 DEBUG:=-g -O0  -DDEBUG
 
-CFLAGS:=${DEBUG} -I. -I${top_srcdir}/src -I${gsoap_prefix}/include -I${gsoap_prefix} -I${stagedir}/include -I${classads_prefix}/include -I${libtar_prefix}/include ${GLOBUS_CFLAGS}
+CFLAGS:=${DEBUG} -I. -I${top_srcdir}/src -I${gsoap_prefix}/include -I${gsoap_prefix} -I${stagedir}/include -I${classads_prefix}/include -I${classads_prefix}/include/classad -I${libtar_prefix}/include ${GLOBUS_CFLAGS}
 # 3.1 CFLAGS:=${DEBUG} -I. -I${top_srcdir}/interface -I${top_srcdir}/src -I${gsoap_prefix}/include -I${gsoap_prefix} -I${stagedir}/include ${GLOBUS_CFLAGS} -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -I${classads_prefix}/include -I${libtar_prefix}/include
 
 LDFLAGS:=-L${stagedir}/lib

diff --git a/org.glite.lb.server/test/test_xml.cpp.T b/org.glite.lb.server/test/test_xml.cpp.T
index 9073970..b4c5d00 100644 (file)
--- a/org.glite.lb.server/test/test_xml.cpp.T
+++ b/org.glite.lb.server/test/test_xml.cpp.T
@@ -25,6 +25,9 @@ public:
 
 static char * compare_events(const edg_wll_Event *e1, const edg_wll_Event *e2)
 {
+       char *tmp1, *tmp2;
+       int tmp3;
+
        if (e1->any.type != e2->any.type) return "type";
 @@@{
        selectType $event '_common_';
@@ -70,6 +73,8 @@ static char * compare_events(const edg_wll_Event *e1, const edg_wll_Event *e2)
 
 static char * compare_states(const edg_wll_JobStat s1, const edg_wll_JobStat s2)
 {
+       char *tmp1, *tmp2;
+       int tmp3;
 @@@{
        selectType $status '_common_';
         for (getFieldsOrdered $status) {