fix build after introducing LCAS (fake global variables and link)

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 767c749..37cd1a3 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -16,6 +16,7 @@ cares_prefix=/opt/c-ares
 gsoap_prefix=/opt/gsoap
 classads_prefix=/opt/classads
 voms_prefix=/opt/voms
+lcas_prefix=/opt/lcas
 
 -include Makefile.inc
 -include ../project/version.properties
@@ -136,6 +137,7 @@ ifeq (${nothrflavour},gcc32dbg)
        vomsflavour :=
 endif
 VOMS_LIBS:=-L${voms_prefix}/lib -lvomsapi${vomsflavour}
+LCAS_LIBS:=-L${lcas_prefix}/lib -llcas
 
 #EXT_LIBS:= \
 #      ${expatlib} -lexpat \
@@ -150,6 +152,7 @@ EXT_LIBS:=  \
        -lz -lcares\
        ${GRIDSITE_LIBS} \
        ${classadslib} \
+       ${LCAS_LIBS} \
        ${VOMS_LIBS}
 
 COMMON_LIBS:= -L${stagedir}/lib  -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour} -lglite_lbu_trio -lglite_lbu_maildir
@@ -177,7 +180,6 @@ ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
                ${LB_MACHINE_LIB} \
                ${LB_UTILS_DB_LIB} \
                ${GSOAP_LIB} \
-               -llcas \
                ${EXT_LIBS} \
                ${classadslib} \
                -lglite_lbu_maildir
@@ -190,7 +192,6 @@ else
                ${LB_MACHINE_LIB} \
                ${LB_UTILS_DB_LIB} \
                -lglite_security_gss_${nothrflavour} \
-               -llcas \
                ${EXT_LIBS} \
                ${classadslib} \
                -lglite_lbu_maildir
@@ -201,7 +202,7 @@ INDEX_OBJS:= index.o index_parse.o jobstat_supp.o openserver.o \
        lb_authz.o store.o bkindex.o stats.o\
        request.o db_store.o srv_purge.o notif_match.o il_lbproxy.o dump.o lb_xml_parse.o il_notification.o lb_proto.o lb_text.o server_state.o lb_xml_parse_V21.o lb_html.o notification.o seqcode.o userjobs.o load.o db_calls.o db_supp.lo
 
-INDEX_LIBS:= ${SRVBONES_LIB} ${COMMON_LIBS} ${LB_MACHINE_LIB} ${EXT_LIBS} ${LB_UTILS_DB_LIB} -llcas
+INDEX_LIBS:= ${SRVBONES_LIB} ${COMMON_LIBS} ${LB_MACHINE_LIB} ${EXT_LIBS} ${LB_UTILS_DB_LIB}
 
 WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o ws_typeref.o
 WS_CLIENT_LIBS:= ${GSOAP_LIB} -lglite_lb_common_${nothrflavour} \
@@ -230,7 +231,7 @@ LIB_OBJS_BK:= \
        db_calls.o db_supp.o
 
 MONDB_OBJS:=mon-db.o ${LIB_OBJS_BK}
-MONDB_LIBS:=${COMMON_LIBS} ${LB_MACHINE_LIB} ${LB_UTILS_DB_LIB} ${EXT_LIBS} 
+MONDB_LIBS:=${COMMON_LIBS} ${LB_MACHINE_LIB} ${LB_UTILS_DB_LIB} ${EXT_LIBS}
 
 LCAS_PLUGIN_OBJS:=lcas_lb.o
 LCAS_PLUGIN_LOBJS:=${LCAS_PLUGIN_OBJS:.o=.lo}

diff --git a/org.glite.lb.server/src/bkindex.c b/org.glite.lb.server/src/bkindex.c
index 0870024..acd7894 100644 (file)
--- a/org.glite.lb.server/src/bkindex.c
+++ b/org.glite.lb.server/src/bkindex.c
@@ -25,6 +25,9 @@
 enum lb_srv_perf_sink sink_mode;
 #endif
 
+/* XXX: referenced global variables, unsed in bkindex */
+char   *server_key,*server_cert;
+int    enable_lcas;
 
 static struct option opts[] = {
        { "mysql",1,NULL,'m' },

diff --git a/org.glite.lb.server/src/mon-db.c b/org.glite.lb.server/src/mon-db.c
index f4f114f..553fc50 100644 (file)
--- a/org.glite.lb.server/src/mon-db.c
+++ b/org.glite.lb.server/src/mon-db.c
@@ -21,6 +21,10 @@
 enum lb_srv_perf_sink sink_mode;
 #endif
 
+/* XXX: referenced global variables, unsed in mon */
+char   *server_key,*server_cert;
+int    enable_lcas;
+
 static struct option opts[] = {
        { "mysql",1,NULL,'m' },
        { "debug",0,NULL,'d' },