From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Wed, 24 Nov 2004 12:52:06 +0000 (+0000)
Subject: minor fixes to work on amd64
X-Git-Tag: glite-lb-server_R_0_5_2~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=96e317c7f959af05b14fc1e161f6a475fefcde6b;p=jra1mw.git

minor fixes to work on amd64
---

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index a4d34e9..845dad4 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -62,7 +62,7 @@ CFLAGS:= -DNO_VOMS -DNO_GACL \
 	-I${ares_prefix}/include \
 	-I${gsoap_prefix}/include \
 	${COVERAGE_FLAGS} \
-	-I${mysql_prefix}/include \
+	-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
 	-I${globus_prefix}/include/${nothrflavour} \
 	-I${gridsite_prefix}/include -I${globus_prefix}/include/${nothrflavour}/openssl
 
@@ -79,9 +79,17 @@ GLOBUS_LIBS:= -L${globus_prefix}/lib \
 	-lglobus_common_${nothrflavour} \
 	-lglobus_gssapi_gsi_${nothrflavour} \
 
+ifneq (${mysql_prefix},/usr)
+	myslqlib := -L${mysql_prefix}/lib
+endif
+
+ifneq (${expat_prefix},/usr)
+	expatlib := -L${expat_prefix}/lib
+endif
+
 EXT_LIBS:= -L${ares_prefix}/lib -lares \
-	-L${mysql_prefix}/lib -lmysqlclient -lz\
-	-L${expat_prefix}/lib -lexpat \
+	${myslqlib} -lmysqlclient -lz\
+	${expatlib} -lexpat \
 	${GLOBUS_LIBS}
 
 GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap
diff --git a/org.glite.lb.server/test/test_xml.cpp.T b/org.glite.lb.server/test/test_xml.cpp.T
index 11875fc..d52cd61 100644
--- a/org.glite.lb.server/test/test_xml.cpp.T
+++ b/org.glite.lb.server/test/test_xml.cpp.T
@@ -103,7 +103,7 @@ void XMLParseTest::protoEventTest()
 	char		*message, *et, *ed;
 
 	edg_wll_InitContext(&ctx);
-	e1 = edg_wll_InitEvent(EDG_WLL_EVENT_REGJOB);
+	e1 = (edg_wll_Event *) calloc(2,sizeof *e1);
 	e1->any.type = EDG_WLL_EVENT_REGJOB;
 
 	e1->regJob.jdl = strdup("very long job = \"blabla\" \\\\ \n hugh\t;");