From 6e7255a643a5a9385e9bdc07d4fa99583ee6c362 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Sat, 14 Nov 2009 14:50:42 +0000
Subject: [PATCH] Finalize build.

---
 org.glite.lb.harvester/Makefile | 13 ++++++++-----
 org.glite.lb/configure          |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index 90caf84..63e3886 100644
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -21,20 +21,23 @@ CC=gcc
 VPATH=${top_srcdir}/src
 
 GLOBUS_CPPFLAGS:=-I${globus_prefix}/include/${thrflavour}
-CPPFLAGS:=${GLOBUS_CPPFLAGS} -I${stagedir}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS}
+CPPFLAGS:=-I${stagedir}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS}
 CFLAGS:=-W -Wall -g -O2 ${CFLAGS}
 LDFLAGS:=${LDFLAGS} 
 LIBS:=-L${stagedir}/${archlib} -L${stagedir}/lib \
 	-lglite_lb_common_${thrflavour} \
 	-lglite_lb_client_${thrflavour} \
-	-lpthread
+	-lpthread -lglite_security_gss_${thrflavour}
 
 ifneq ($(GLITE_LB_HARVESTER_WITH_LBU_DB),no)
 CPPFLAGS:=$(CPPFLAGS) -DWITH_LBU_DB=1
 LIBS:=$(LIBS) -lglite_lbu_db
 endif
 ifeq ($(GLITE_LB_HARVESTER_WITH_OLD_LB),yes)
-CPPFLAGS:=$(CPPFLAGS) -DWITH_OLD_LB=1
+CPPFLAGS:=${GLOBUS_CPPFLAGS} $(CPPFLAGS) -DWITH_OLD_LB=1
+LIBS:=$(LIBS) -lglite_wmsutils_cjobid
+else
+LIBS:=$(LIBS) -lglite_jobid
 endif
 
 COMPILE:=libtool --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS}
@@ -64,10 +67,10 @@ clean:
 	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
 harvester: harvester.o
-	${LINK} -o $@ $+ ${LDFLAGS} ${LIBS}
+	${LINK} -o $@ $+ ${LIBS}
 
 harvester-dbg: harvester-dbg.o
-	${LINK} -o $@ $+ ${LDFLAGS} ${LIBS}
+	${LINK} -o $@ $+ ${LIBS}
 
 harvester-dbg.o: harvester.c
 	${COMPILE} -Werror -DLOG=1 -DWITH_RTM_SQL_STORAGE=1 -c $< -o $@
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index ff59db3..3f5fc54 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -384,7 +384,10 @@ for my $jar (keys %need_jars) {
 	'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
 	'lb.ws-interface' => [ qw/lb.types:B/ ],
 	'lb.types' => [ qw// ],
-	'lb.harvester' => [ qw/jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client/ ],
+	'lb.harvester' => [ qw/
+		jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
+		security.gss
+	/ ],
 	'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
 	'lbjp-common.maildir' => [ qw// ],
 	'lbjp-common.server-bones' => [ qw// ],
-- 
1.8.2.3