From 1d0b57b1f279b2814c0e91f3d62417c62fe736d2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 24 Oct 2008 15:29:17 +0000
Subject: [PATCH] Build from scratch on SL4/64bit.

---
 org.glite.lb.client/examples/job_status.c         |  2 --
 org.glite.lb.client/examples/multiple_user_jobs.c |  2 --
 org.glite.lb.client/examples/user_jobs.c          |  2 --
 org.glite.lb.client/examples/user_jobs_threaded.c |  2 --
 org.glite.lb.client/src/ServerConnection.cpp      |  2 --
 org.glite.lb.client/src/consumer.c                |  2 --
 org.glite.lb.common/Makefile                      | 11 ++++++-----
 org.glite.lb.common/interface/xml_conversions.h   |  4 +---
 org.glite.lb.common/test/test_main.cpp            |  6 +++++-
 9 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/org.glite.lb.client/examples/job_status.c b/org.glite.lb.client/examples/job_status.c
index 5ffa072..cc30d25 100644
--- a/org.glite.lb.client/examples/job_status.c
+++ b/org.glite.lb.client/examples/job_status.c
@@ -6,8 +6,6 @@
 #include <errno.h>
 #include <time.h>
 
-#include <expat.h>
-
 #include "glite/lb/context-int.h"
 #include "consumer.h"
 #include "glite/lb/xml_conversions.h"
diff --git a/org.glite.lb.client/examples/multiple_user_jobs.c b/org.glite.lb.client/examples/multiple_user_jobs.c
index 80a350a..4c38c21 100644
--- a/org.glite.lb.client/examples/multiple_user_jobs.c
+++ b/org.glite.lb.client/examples/multiple_user_jobs.c
@@ -2,8 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <expat.h>
-
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
 #include "consumer.h"
diff --git a/org.glite.lb.client/examples/user_jobs.c b/org.glite.lb.client/examples/user_jobs.c
index a593e08..918625c 100644
--- a/org.glite.lb.client/examples/user_jobs.c
+++ b/org.glite.lb.client/examples/user_jobs.c
@@ -4,8 +4,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <expat.h>
-
 #include "glite/lb/context.h"
 #include "glite/lb/xml_conversions.h"
 #include "consumer.h"
diff --git a/org.glite.lb.client/examples/user_jobs_threaded.c b/org.glite.lb.client/examples/user_jobs_threaded.c
index a144106..fbe0f71 100644
--- a/org.glite.lb.client/examples/user_jobs_threaded.c
+++ b/org.glite.lb.client/examples/user_jobs_threaded.c
@@ -6,8 +6,6 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include <expat.h>
-
 #include <pthread.h>
 
 #include "glite/lb/context.h"
diff --git a/org.glite.lb.client/src/ServerConnection.cpp b/org.glite.lb.client/src/ServerConnection.cpp
index d890cf5..76111ad 100644
--- a/org.glite.lb.client/src/ServerConnection.cpp
+++ b/org.glite.lb.client/src/ServerConnection.cpp
@@ -12,8 +12,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include <expat.h>
-
 #include "glite/jobid/JobId.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/xml_conversions.h"
diff --git a/org.glite.lb.client/src/consumer.c b/org.glite.lb.client/src/consumer.c
index 37d95d3..73de913 100644
--- a/org.glite.lb.client/src/consumer.c
+++ b/org.glite.lb.client/src/consumer.c
@@ -7,8 +7,6 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include <expat.h>
-
 #include "glite/jobid/cjobid.h"
 #include "glite/lb/context-int.h"
 #include "glite/lb/mini_http.h"
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index ea74ab3..a1f8357 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -51,17 +51,18 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
 	-DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \
 	-DBUILDING_LB_COMMON 
 
-ifneq (${expat_prefix},/usr)
-	EXPAT_LIBS:=-L${expat_prefix}/lib
-endif
-EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
-
 archlib:=lib
 host_cpu:=${shell uname -m}
 ifeq (${host_cpu},x86_64)
     archlib:=lib64
 endif
 
+ifneq (${expat_prefix},/usr)
+	EXPAT_LIBS:=-L${expat_prefix}/${archlib} -L${expat_prefix}/lib
+endif
+
+EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
+
 ifneq (${classads_prefix},/usr)
         classadslib := -L${classads_prefix}/${archlib} -L${classads_prefix}/lib 
 endif
diff --git a/org.glite.lb.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h
index 2c9910d..792e487 100644
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ b/org.glite.lb.common/interface/xml_conversions.h
@@ -3,8 +3,6 @@
 
 #ident "$Header$"
 
-#include <expat.h>
-
 #include "glite/jobid/cjobid.h"
 
 #ifdef BUILDING_LB_COMMON
@@ -34,7 +32,7 @@ enum edg_wll_QueryType {
 
 typedef struct _edg_wll_XML_ctx {
 	edg_wll_Context ctx;			
-        XML_Parser      p;
+        void		*p;
 	char		*message_body;		/* copy of pointer to data to be parsed */		
         edg_wll_EventCode   eventCode;          /* code of processed event */
         int             position;               /* row index in the result list */
diff --git a/org.glite.lb.common/test/test_main.cpp b/org.glite.lb.common/test/test_main.cpp
index 1caa44e..9aedf97 100644
--- a/org.glite.lb.common/test/test_main.cpp
+++ b/org.glite.lb.common/test/test_main.cpp
@@ -8,7 +8,11 @@
 #include <cppunit/TestResult.h>
 #include <cppunit/TestResultCollector.h>
 
-#include <glite/lb/connpool.h>
+#ifdef BUILDING_LB_COMMON
+#include "connpool.h"
+#else
+#include "glite/lb/connpool.h"
+#endif
 
 int main (int argc,const char *argv[])
 {
-- 
1.8.2.3