EMI build:

- flavour-less build
- updated m4 macros, fixed L&B checks
- prefer package CFLAGS/LIBS, if defined

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 902b9c1..cfc5970 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -6,9 +6,6 @@ lbprefix=lb
 package=glite-lb-client
 version=0.0.0
 
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-
 CC:=gcc
 CXX:=g++
 
@@ -89,8 +86,9 @@ ifdef LB_PERF
        LB_PERF_FLAGS:=-DLB_PERF
        LB_PERF_TOOLS:=perftest_logjobs perftest_jobreg
 endif
-COMMON_LIB:=-lglite_lb_common_${nothrflavour}
+COMMON_LIB_NOTHR:=-lglite_lb_common_${nothrflavour}
 COMMON_LIB_THR:=-lglite_lb_common_${thrflavour}
+COMMON_LIB:=-lglite_lb_common
 TRIO_LIB:=-lglite_lbu_trio
 
 CFLAGS:=${CFLAGS} ${DEBUG} \
@@ -105,8 +103,8 @@ CXXFLAGS:=${CFLAGS}
 
 EXT_LIB:=
 
-TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
-TEST_INC:=-I${cppunit_prefix}/include
+CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit
+CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include
 
 LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} ${COVERAGE_FLAGS}
 
@@ -133,11 +131,30 @@ PLUSTHROBJS:=${PLUSOBJS:.o=.thr.o}
 PLUSLOBJS:=${PLUSOBJS:.o=.lo}
 PLUSTHRLOBJS:=${PLUSOBJS:.o=.thr.lo}
 
-LIB:=libglite_lb_client_${nothrflavour}.la
+NOTHRLIB:=libglite_lb_client_${nothrflavour}.la
 THRLIB:=libglite_lb_client_${thrflavour}.la
-
-PLUSLIB:=libglite_lb_clientpp_${nothrflavour}.la
+LIB:=libglite_lb_client.la
+NOTHRPLUSLIB:=libglite_lb_clientpp_${nothrflavour}.la
 THRPLUSLIB:=libglite_lb_clientpp_${thrflavour}.la
+PLUSLIB:=libglite_lb_clientpp.la
+ifeq (${thrflavour},)
+c_LIBRARIES=${LIB}
+plus_LIBRARIES=${PLUSLIB}
+default_clientlib=${LIB}
+default_clientpluslib=${PLUSLIB}
+default_commonlib=${COMMON_LIB}
+default_clientlib_thr=${LIB}
+default_commonlib_thr=${COMMON_LIB}
+else
+c_LIBRARIES=${NOTHRLIB} ${THRLIB}
+plus_LIBRARIES=${NOTHRPLUSLIB} ${THRPLUSLIB}
+default_clientlib=${NOTHRLIB}
+default_clientpluslib=${NOTHRPLUSLIB}
+default_commonlib=${COMMON_LIB_NOTHR}
+default_clientlib_thr=${THRLIB}
+default_commonlib_thr=${COMMON_LIB_THR}
+endif
+lib_LTLIBRARIES=${c_LIBRARIES} ${plus_LIBRARIES}
 
 TOOLS:=${LB_PERF_TOOLS}
 EXAMPLES_SRC:=log_usertag_proxy.c job_log.c job_reg.c feed_shark.c query_ext.c query_seq_code.c stats.c stats-duration-fromto.c abort_job.c change_acl.c stresslog.c flood_proxy.c dagids.c stress_context.c parse_eventsfile.c test_changed_jdl.c done_failed_events.c
@@ -170,18 +187,27 @@ version_info:=-version-info ${shell \
        perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
 ifdef LB_STANDALONE
-compile all: generate ${LIB} ${THRLIB} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
+compile all: generate ${c_LIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
 else
-compile all: check_version generate ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
+compile all: check_version generate ${lib_LTLIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
 endif
 
 generate: ${GEN_HDRS}
 
 default: all
 
+ifeq (${thrflavour},)
 ${LIB}: ${LIBOBJS}
        ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir} \
                        ${COMMON_LIB} ${TRIO_LIB} \
+                       -lglite_security_gss
+
+${PLUSLIB}: ${PLUSOBJS} ${LIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
+else
+${NOTHRLIB}: ${LIBOBJS}
+       ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${PREFIX}/${libdir} \
+                       ${COMMON_LIB_NOTHR} ${TRIO_LIB} \
                        -lglite_security_gss_${nothrflavour}
 
 ${THRLIB}: ${LIBTHROBJS}
@@ -189,31 +215,32 @@ ${THRLIB}: ${LIBTHROBJS}
                        ${COMMON_LIB_THR} ${TRIO_LIB} \
                        -lglite_security_gss_${thrflavour}
 
-${PLUSLIB}: ${PLUSOBJS} ${LIB}
-       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/${libdir} ${LIB} ${PLUS_EXTRA_LIB}
+${NOTHRPLUSLIB}: ${PLUSOBJS} ${NOTHRLIB}
+       ${LINKXX} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${PREFIX}/${libdir} ${NOTHRLIB} ${PLUS_EXTRA_LIB}
 
 ${THRPLUSLIB}: ${PLUSTHROBJS} ${THRLIB}
        ${LINKXX} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${PREFIX}/${libdir} ${THRLIB} ${PLUS_EXTRA_LIB}
+endif
 
 logevent: logevent.o args.o
-       ${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB} 
+       ${LINK} -o $@ logevent.o args.o ${default_clientlib} ${EXT_LIB} 
 
 notify: notify.o
-       ${LINKXX} -o $@ notify.o ${PLUSLIB} ${EXT_LIB} ${PLUS_EXTRA_LIB}
+       ${LINKXX} -o $@ notify.o ${default_clientpluslib} ${EXT_LIB} ${PLUS_EXTRA_LIB}
 
 register_sandbox: %: %.o
-       ${LINK} -o $@ $@.o ${LIB} ${EXT_LIB}
+       ${LINK} -o $@ $@.o ${default_clientlib} ${EXT_LIB}
 
 ${TOOLS} ${EXAMPLES}: %: %.o
-       ${LINK} -o $@ $< ${LIB} ${EXT_LIB} 
+       ${LINK} -o $@ $< ${default_clientlib} ${EXT_LIB} 
 
 ${EXAMPLES_CL}: %: %.o
-       ${LINK} -o $@ $< ${LIB} ${COMMON_LIB} ${EXT_LIB} 
+       ${LINK} -o $@ $< ${default_clientlib} ${default_commonlib} ${EXT_LIB} 
 
 ${EXAMPLES_CL_THR}: %: %.o
-       ${LINK} -o $@ $< ${THRLIB} ${COMMON_LIB_THR} ${EXT_LIB} 
+       ${LINK} -o $@ $< ${default_clientlib_thr} ${default_commonlib_thr} ${EXT_LIB} 
 
-${TOOLS}: ${LIB}
+${TOOLS}: ${default_clientlib}
 
 ${PLUSOBJS}: %.o: %.cpp
        ${CXXCOMPILE} -c $<
@@ -221,10 +248,10 @@ ${PLUSOBJS}: %.o: %.cpp
 ${PLUSTHROBJS}: %.thr.o: %.cpp
        ${CXXCOMPILE} -o $@ -c $<
 
-${EXAMPLES_PLUS}: ${PLUSLIB}
+${EXAMPLES_PLUS}: ${default_clientpluslib}
 
 ${EXAMPLES_PLUS}: %: %.o
-       ${LINKXX} -o $@ $< ${PLUSLIB}
+       ${LINKXX} -o $@ $< ${default_clientpluslib}
 
 ${LIBOBJS}: %.o: %.c
        ${COMPILE} -c $<
@@ -274,26 +301,17 @@ perftest_logjobs.o: perftest_logjobs.c
 
 examples: ${EXAMPLES} ${EXAMPLES_PLUS} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS}
 
-check: compile check.api
+check: compile 
 # shut up check.producer
 
 check.producer: producer_test
        ./producer_test
 
 producer_test: producer_test.o prod_proto_test.o
-       ${LINKXX} -o $@ ${LIB} ${TEST_LIBS} $+ ${EXT_LIB}
+       ${LINKXX} -o $@ ${default_clientlib} ${CPPUNIT_LIBS} $+ ${EXT_LIB}
 
 producer_test.o: %.o: %.cpp
-       ${CXX} -c ${CXXFLAGS} ${TEST_INC} $<
-
-check.api: api_test
-       ./api_test
-
-api_test.o: %.o: %.cpp uiwrap.c
-       ${CXX} -c ${CXXFLAGS} ${TEST_INC} $<
-
-api_test: api_test.o
-       ${LINKXX} -o $@ ${LIB} ${COMMON_LIB} ${TEST_LIBS} $+ ${EXT_LIB}
+       ${CXX} -c ${CXXFLAGS} ${CPPUNIT_CFLAGS} $<
 
 man: ${MAN_GZ} ${MAN8_GZ}
 
@@ -321,10 +339,9 @@ install:
        mkdir -p ${PREFIX}/share/man/man8
        mkdir -p ${PREFIX}/share/build/m4
 ifdef LB_STANDALONE
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/${libdir}
+       ${INSTALL} -m 644 ${c_LIBRARIES} ${PREFIX}/${libdir}
 else
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${PREFIX}/${libdir}
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/${libdir}
+       ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${PREFIX}/${libdir}
 endif
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} )
@@ -358,8 +375,8 @@ endif
        ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${PREFIX}/share/build/m4/
 
 clean:
-       rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test api_test notify C/ CPP/
-       rm -rvf ${LIB} ${THRLIB} ${TOOLS} logevent  register_sandbox ${PLUSLIB} ${THRPLUSLIB} ${MAN_GZ} ${MAN8_GZ}
+       rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/
+       rm -rvf ${lib_LTLIBRARIES} ${TOOLS} logevent  register_sandbox ${MAN_GZ} ${MAN8_GZ}
        rm -rvf ${EXAMPLES} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS}
        rm -f EventAttrNames.pl
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ debian/
@@ -368,4 +385,4 @@ check_version:
        ${CHECK_VERSION} ${stagedir}/include/glite/lb/common_version.h
 
 
-.PHONY: default all compile examples check stage install clean check_version check.producer check.api
+.PHONY: default all compile examples check stage install clean check_version

diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.client/configure
+++ b/org.glite.lb.client/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.client/m4/glite_lb.m4 b/org.glite.lb.client/m4/glite_lb.m4
index daf7791..4c89b14 100644 (file)
--- a/org.glite.lb.client/m4/glite_lb.m4
+++ b/org.glite.lb.client/m4/glite_lb.m4
@@ -18,17 +18,28 @@ AC_LANG_CONFTEST(
   )]
 )
 
-LIBS="-lglite_lb_common_$GLOBUS_THR_FLAVOR $LIBS"
+LIBS="-lglite_lb_common $save_LIBS"
 AC_LINK_IFELSE([],
-  [AC_SUBST([GLITE_LB_COMMON_THR_LIBS], [-lglite_lb_common_$GLOBUS_THR_FLAVOR])],
-  [AC_MSG_ERROR([cannot find org.glite.lb.common ($GLOBUS_THR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-LIBS="-lglite_lb_common_$GLOBUS_NOTHR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
-  [AC_SUBST([GLITE_LB_COMMON_NOTHR_LIBS], [-lglite_lb_common_$GLOBUS_NOTHR_FLAVOR])],
-  [AC_MSG_ERROR([cannot find org.glite.lb.common (GLOBUS_NOTHR_FLAVOR)])]
+  [
+       AC_SUBST([GLITE_LB_COMMON_LIBS], [-lglite_lb_common])
+       AC_SUBST([GLITE_LB_COMMON_THR_LIBS], [-lglite_lb_common])
+       AC_SUBST([GLITE_LB_COMMON_NOTHR_LIBS], [])
+  ],
+  [
+       LIBS="-lglite_lb_common_$GLOBUS_THR_FLAVOR $save_LIBS"
+       AC_LINK_IFELSE([],
+               [AC_SUBST([GLITE_LB_COMMON_THR_LIBS], [-lglite_lb_common_$GLOBUS_THR_FLAVOR])],
+               [AC_MSG_ERROR([cannot find org.glite.lb.common ($GLOBUS_THR_FLAVOR)])]
+       )
+
+       LIBS="-lglite_lb_common_$GLOBUS_NOTHR_FLAVOR $save_LIBS"
+       AC_LINK_IFELSE([],
+               [AC_SUBST([GLITE_LB_COMMON_NOTHR_LIBS], [-lglite_lb_common_$GLOBUS_NOTHR_FLAVOR])],
+               [AC_MSG_ERROR([cannot find org.glite.lb.common ($GLOBUS_NOTHR_FLAVOR)])]
+       )
+
+       AC_SUBST([GLITE_LB_COMMON_LIBS], [-lglite_lb_common_$GLOBUS_THR_FLAVOR])
+  ]
 )
 LIBS=$save_LIBS
 
@@ -43,12 +54,17 @@ AC_MSG_RESULT([yes])
 
 dnl Usage:
 dnl AC_GLITE_LB
+dnl - GLITE_LB_CLIENT_LIBS
+dnl - GLITE_LB_CLIENTPP_LIBS
+dnl - GLITE_LB_COMMON_LIBS
+dnl
 dnl - GLITE_LB_THR_CLIENT_LIBS
 dnl - GLITE_LB_THR_CLIENTPP_LIBS
 dnl - GLITE_LB_THR_COMMON_LIBS
 dnl - GLITE_LB_NOTHR_CLIENT_LIBS
 dnl - GLITE_LB_NOTHR_CLIENTPP_LIBS
 dnl - GLITE_LB_NOTHR_COMMON_LIBS
+dnl
 dnl - GLITE_STATIC_LB_NOTHR_CLIENT_LIBS
 dnl - GLITE_STATIC_LB_NOTHR_COMMON_LIBS
 
@@ -87,6 +103,23 @@ AC_DEFUN([AC_GLITE_LB],
         GLITE_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common_$GLOBUS_NOTHR_FLAVOR $SEC_GSOAP_PLUGIN_GSS_NOTHR_LIBS"
        GLITE_STATIC_LB_NOTHR_CLIENT_LIBS="$ac_glite_lb_prefix/$ac_glite_lb_libdir/libglite_lb_client_$GLOBUS_NOTHR_FLAVOR.a"
        GLITE_STATIC_LB_NOTHR_COMMON_LIBS="$ac_glite_lb_prefix/$ac_glite_lb_libdir/libglite_lb_common_$GLOBUS_NOTHR_FLAVOR.a $SEC_GSOAP_PLUGIN_GSS_STATIC_NOTHR_LIBS"
+       dnl default flavour
+       GLITE_LB_CLIENT_LIBS="$GLITE_LB_THR_CLIENT_LIBS"
+       GLITE_LB_CLIENTPP_LIBS="$GLITE_LB_THR_CLIENTPP_LIBS"
+       GLITE_LB_COMMON_LIBS="$GLITE_LB_THR_COMMON_LIBS"
+
+       dnl the flavoured ones not found
+       if ! test -f "$GLITE_STATIC_LB_NOTHR_CLIENT_LIBS"; then
+               GLITE_LB_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client"
+               GLITE_LB_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp"
+               GLITE_LB_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common $SEC_GSOAP_PLUGIN_GSS_THR_LIBS"
+               GLITE_LB_THR_CLIENT_LIBS="$ac_glite_lb_lib -lglite_lb_client"
+               GLITE_LB_THR_CLIENTPP_LIBS="$ac_glite_lb_lib -lglite_lb_clientpp"
+               GLITE_LB_THR_COMMON_LIBS="$ac_glite_lb_lib -lglite_lb_common $SEC_GSOAP_PLUGIN_GSS_THR_LIBS"
+               GLITE_LB_NOTHR_CLIENT_LIBS=""
+               GLITE_LB_NOTHR_CLIENTPP_LIBS=""
+               GLITE_LB_NOTHR_COMMON_LIBS=""
+       fi
        ifelse([$2], , :, [$2])
     else
        GLITE_LB_THR_CLIENT_LIBS=""
@@ -97,6 +130,9 @@ AC_DEFUN([AC_GLITE_LB],
        GLITE_LB_NOTHR_COMMON_LIBS=""
        GLITE_STATIC_LB_NOTHR_CLIENT_LIBS=""
         GLITE_STATIC_LB_NOTHR_COMMON_LIBS=""
+       GLITE_LB_CLIENT_LIBS=""
+       GLITE_LB_CLIENTPP_LIBS=""
+       GLITE_LB_COMMON_LIBS=""
        ifelse([$3], , :, [$3])
     fi
 
@@ -108,18 +144,22 @@ AC_DEFUN([AC_GLITE_LB],
     AC_SUBST(GLITE_LB_NOTHR_COMMON_LIBS)
     AC_SUBST(GLITE_STATIC_LB_NOTHR_CLIENT_LIBS)
     AC_SUBST(GLITE_STATIC_LB_NOTHR_COMMON_LIBS)
+    dnl default flavour
+    AC_SUBST(GLITE_LB_CLIENT_LIBS)
+    AC_SUBST(GLITE_LB_CLIENTPP_LIBS)
+    AC_SUBST(GLITE_LB_COMMON_LIBS)
 ])
 
 AC_DEFUN([GLITE_CHECK_LB_CLIENT],
-[AC_MSG_CHECKING([for org.glite.lb.client])
-save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $GLITE_CPPFLAGS"
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS $GLITE_LDFLAGS -L$GLOBUS_LOCATION/lib"
-save_LIBS=$LIBS
+[AC_REQUIRE([AC_GLITE])
+AC_MSG_CHECKING([for org.glite.lb.client])
 
 AC_LANG_PUSH([C])
 
+CPPFLAGS="$CPPFLAGS $GLITE_CPPFLAGS"
+CFLAGS="$CFLAGS $GLITE_CFLAGS"
+LDFLAGS="$LDFLAGS $GLITE_LDFLAGS -L$GLOBUS_LOCATION/lib"
+
 # prepare the test program, to link against the different combinations
 # of globus flavours
 
@@ -135,24 +175,37 @@ AC_LANG_CONFTEST(
   )]
 )
 
-LIBS="-lglite_lb_client_$GLOBUS_THR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
-  [AC_SUBST([GLITE_LB_CLIENT_THR_LIBS], [-lglite_lb_client_$GLOBUS_THR_FLAVOR])],
-  [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_THR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-LIBS="-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR $LIBS"
+LIBS="-lglite_lb_client $save_LIBS"
 AC_LINK_IFELSE([],
-  [AC_SUBST([GLITE_LB_CLIENT_NOTHR_LIBS], [-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR])],
-  [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_NOTHR_FLAVOR)])]
+  [AC_SUBST([GLITE_LB_CLIENT_LIBS], [-lglite_lb_client])
+   AC_SUBST([GLITE_LB_CLIENT_THR_LIBS], [-lglite_lb_client])
+   AC_SUBST([GLITE_LB_CLIENT_NOTHR_LIBS], [])
+  ],
+  [
+       LIBS="-lglite_lb_client_$GLOBUS_THR_FLAVOR $save_LIBS"
+       AC_LINK_IFELSE([],
+         [AC_SUBST([GLITE_LB_CLIENT_THR_LIBS], [-lglite_lb_client_$GLOBUS_THR_FLAVOR])],
+         [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_THR_FLAVOR)])]
+       )
+
+       LIBS="-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR $save_LIBS"
+       AC_LINK_IFELSE([],
+         [AC_SUBST([GLITE_LB_CLIENT_NOTHR_LIBS], [-lglite_lb_client_$GLOBUS_NOTHR_FLAVOR])],
+         [AC_MSG_ERROR([cannot find org.glite.lb.client ($GLOBUS_NOTHR_FLAVOR)])]
+       )
+
+       AC_SUBST([GLITE_LB_CLIENT_LIBS], [-lglite_lb_client_$GLOBUS_THR_FLAVOR])
+  ]
 )
-LIBS=$save_LIBS
 
 AC_LANG_POP([C])
 
 AC_LANG_PUSH([C++])
 
+CPPFLAGS="$CPPFLAGS $GLITE_CPPFLAGS"
+CXXFLAGS="$CXXFLAGS $GLITE_CFLAGS"
+LDFLAGS="$LDFLAGS $GLITE_LDFLAGS -L$GLOBUS_LOCATION/lib"
+
 # prepare the test program, to link against the different combinations
 # of globus flavours
 
@@ -163,26 +216,30 @@ AC_LANG_CONFTEST(
   )]
 )
 
-save_LIBS=$LIBS
-LIBS="-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR $LIBS"
-AC_LINK_IFELSE([],
-  [AC_SUBST([GLITE_LB_CLIENTPP_THR_LIBS], [-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR])],
-  [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_THR_FLAVOR)])]
-)
-LIBS=$save_LIBS
-
-LIBS="-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR $LIBS"
+LIBS="-lglite_lb_clientpp $save_LIBS"
 AC_LINK_IFELSE([],
-  [AC_SUBST([GLITE_LB_CLIENTPP_NOTHR_LIBS], [-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR])],
-  [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_NOTHR_FLAVOR)])]
+  [AC_SUBST([GLITE_LB_CLIENTPP_LIBS], [-lglite_lb_clientpp])
+   AC_SUBST([GLITE_LB_CLIENTPP_THR_LIBS], [-lglite_lb_clientpp])
+   AC_SUBST([GLITE_LB_CLIENTPP_NOTHR_LIBS], [])],
+  [
+       LIBS="-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR $save_LIBS"
+       AC_LINK_IFELSE([],
+         [AC_SUBST([GLITE_LB_CLIENTPP_THR_LIBS], [-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR])],
+         [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_THR_FLAVOR)])]
+       )
+
+       LIBS="-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR $save_LIBS"
+       AC_LINK_IFELSE([],
+         [AC_SUBST([GLITE_LB_CLIENTPP_NOTHR_LIBS], [-lglite_lb_clientpp_$GLOBUS_NOTHR_FLAVOR])],
+         [AC_MSG_ERROR([cannot find org.glite.lb.client (C++ - $GLOBUS_NOTHR_FLAVOR)])]
+       )
+
+       AC_SUBST([GLITE_LB_CLIENTPP_LIBS], [-lglite_lb_clientpp_$GLOBUS_THR_FLAVOR])
+  ]
 )
-LIBS=$save_LIBS
 
 AC_LANG_POP([C++])
 
-LDFLAGS="$save_LDFLAGS"
-CPPFLAGS=$save_CPPFLAGS
-
 AC_MSG_RESULT([yes])
 
 ])

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 4c90e7c..0454375 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -8,8 +8,6 @@ package=glite-lb-common
 version=0.0.0
 PREFIX=/opt/glite
 
-nothrflavour=gcc32
-thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 
 -include Makefile.inc
@@ -39,39 +37,36 @@ TRIO_LIB:=-lglite_lbu_trio
 PERF_HDRS:=lb_perftest.h
 PERF_OBJS:=lb_perftest.o
 
-CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
-       -I. \
-       -I${top_srcdir}/test \
-       -I${stagedir}/include \
-       -I${expat_prefix}/include \
-       -I${classads_prefix}/include \
-       -I${classads_prefix}/include/classad \
-       ${COVERAGE_FLAGS} \
-       -D_GNU_SOURCE \
-       -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \
-       -DBUILDING_LB_COMMON 
 
 ifneq (${expat_prefix},/usr)
-       EXPAT_LIBS:=-L${expat_prefix}/${libdir} -L${expat_prefix}/lib
+        expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib 
 endif
-
-EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
-
 ifneq (${classads_prefix},/usr)
         classadslib := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib 
 endif
 
-classadslib := ${classadslib} -lclassad
+CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit
+CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include
+EXPAT_CFLAGS?=-I${expat_prefix}/include
+EXPAT_LIBS?=${expatlib} -lexpat
+CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/classad
+CLASSADS_LIBS?=${classadslib} -lclassad
 
+CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
+       -I. \
+       -I${top_srcdir}/test \
+       -I${stagedir}/include \
+       ${EXPAT_CFLAGS} \
+       ${CLASSADS_CFLAGS} \
+       ${COVERAGE_FLAGS} \
+       -D_GNU_SOURCE \
+       -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \
+       -DBUILDING_LB_COMMON 
 
 LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir} -L${stagedir}/lib \
        ${COVERAGE_FLAGS}
 
-EXT_LIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${classadslib}
-EXT_THRLIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${classadslib}
-
-TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
-TEST_INC:=-I${cppunit_prefix}/include
+EXT_LIBS:= ${EXPAT_LIBS} ${JOBID_LIB} ${TRIO_LIB} ${CLASSADS_LIBS}
 
 ifdef LB_PROF
         CFLAGS:= ${CFLAGS} -pg -g
@@ -99,13 +94,25 @@ HDRS:=context.h context-int.h lb_plain_io.h mini_http.h authz.h xml_parse.h \
        query_rec.h timeouts.h LoggingExceptions.h CountRef.h ${PERF_HDRS} 
 GEN_HDRS:=events.h jobstat.h common_version.h
 
-STATICLIB:=libglite_lb_common_${nothrflavour}.a
+NOTHRSTATICLIB:=libglite_lb_common_${nothrflavour}.a
 THRSTATICLIB:=libglite_lb_common_${thrflavour}.a
-LTLIB:=libglite_lb_common_${nothrflavour}.la
+STATICLIB:=libglite_lb_common.a
+NOTHRLTLIB:=libglite_lb_common_${nothrflavour}.la
 THRLTLIB:=libglite_lb_common_${thrflavour}.la
+LTLIB:=libglite_lb_common.la
 
 REPORTS:=${top_srcdir}/reports
 
+ifeq (${thrflavour},)
+lib_LTLIBRARIES=${LTLIB}
+lib_LIBRARIES=${STATICLIB}
+default_commonlib=${LTLIB}
+else
+lib_LTLIBRARIES=${THRLTLIB} ${THRLTLIB}
+lib_LIBRARIES=${NOTHRSTATICLIB} ${THRSTATICLIB}
+default_commonlib=${NOTHRLTLIB}
+endif
+
 ifdef LB_PERF
 STAGE_PERFTEST=mkdir -p ${PREFIX}/examples/perftest; \
                ${INSTALL} -m 644 ${top_srcdir}/examples/*.log ${PREFIX}/examples/perftest; \
@@ -121,7 +128,7 @@ generate: ${GEN_HDRS}
 common_version.h: ${top_srcdir}/project/version.properties
        echo "#define GLITE_LB_COMMON_VERSION \"${version}\"" >$@
 
-all compile: generate ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB}
+all compile: generate ${lib_LTLIBRARIES} ${lib_LIBRARIES}
 
 # In order to use libtool versioning correcty, we must have:
 #
@@ -138,15 +145,26 @@ offset=2
 version_info:=-version-info ${shell \
        perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
+ifeq (${thrflavour},)
 ${STATICLIB}: ${OBJS}
        ar crv $@ ${OBJS}
        ranlib $@
 
+${LTLIB}: ${OBJS}
+       ${LINKXX} ${version_info} -o $@ ${LOBJS} \
+               -lglite_security_gss \
+               ${EXT_LIBS} \
+               -lm
+else
+${NOTHRSTATICLIB}: ${OBJS}
+       ar crv $@ ${OBJS}
+       ranlib $@
+
 ${THRSTATICLIB}: ${THROBJS}
        ar crv $@ ${THROBJS}
        ranlib $@
 
-${LTLIB}: ${OBJS}
+${NOTHRLTLIB}: ${OBJS}
        ${LINKXX} ${version_info} -o $@ ${LOBJS} \
                -lglite_security_gss_${nothrflavour} \
                ${EXT_LIBS} \
@@ -155,8 +173,9 @@ ${LTLIB}: ${OBJS}
 ${THRLTLIB}: ${THROBJS}
        ${LINKXX} ${version_info} -o $@ ${THRLOBJS} \
                -lglite_security_gss_${thrflavour} \
-               ${EXT_THRLIBS} \
+               ${EXT_LIBS} \
                -lm
+endif
 
 stage: compile
        $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
@@ -170,13 +189,13 @@ check.parse: test_parse
        LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_parse ${REPORTS}/parse.xml
 
 test_parse: parse.o test_main.cpp
-       ${LINKXX} -o test_parse parse.o ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
+       ${LINKXX} -o test_parse parse.o ${default_commonlib} ${CPPUNIT_LIBS} ${EXT_LIBS}
 
 check.il: il_test
        LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./il_test ${REPORTS}/il.xml
 
 il_test: il_test.o il_int_test.o il_string_test.o il_msg_test.o
-       ${LINKXX} -o $@ $+ ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
+       ${LINKXX} -o $@ $+ ${default_commonlib} ${CPPUNIT_LIBS} ${EXT_LIBS}
 
 test_coverage:
        -mkdir coverage
@@ -203,14 +222,14 @@ olddoc: generate events.tex status.tex
 install: 
        mkdir -p ${PREFIX}/${libdir}
        mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples
-       ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${MAILDIR_LIB} ${PREFIX}/${libdir}
+       ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${PREFIX}/${libdir}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} )
 #      cp -r C CPP ${PREFIX}/share/doc/${package}-${version}
        mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ;
        (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) ;
        ${INSTALL} -m 644 ${GEN_HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix} ;
-       ${INSTALL} -m 644 ${STATICLIB} ${THRSTATICLIB} ${PREFIX}/${libdir};
+       ${INSTALL} -m 644 ${lib_LIBRARIES} ${PREFIX}/${libdir};
        if [ x${LB_STANDALONE} = xyes ]; then \
                mkdir -p ${PREFIX}/include/glite/wmsutils/jobid ; \
                ${INSTALL} -m 644 glite/wmsutils/jobid/*.h ${PREFIX}/include/glite/wmsutils/jobid/ ; \
@@ -225,7 +244,7 @@ clean:
        ${COMPILE} ${CFLAGS} -c $<
 
 il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp test_main.cpp
-       ${CXX} -c ${CFLAGS} ${TEST_INC} $<
+       ${CXX} -c ${CFLAGS} ${CPPUNIT_CFLAGS} $<
 
 %.thr.o: %.c
        ${COMPILE} ${CFLAGS} -D_REENTRANT -DGLITE_LB_THREADED -o $@ -c $<

diff --git a/org.glite.lb.common/configure b/org.glite.lb.common/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.common/configure
+++ b/org.glite.lb.common/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index 07c4434..6f753c9 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -4,14 +4,7 @@ package=glite-lb-harvester
 module.version=0.0.0
 PREFIX=/opt/glite
 globus_prefix=/opt/globus
-
-archlib:=lib
-thrflavour:=gcc32dbgpthr
-host_cpu:=${shell uname -m}
-ifeq (${host_cpu},x86_64) 
-        archlib:=lib64
-       thrflavour:=gcc64dbgpthr
-endif   
+libdir=lib
 
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
@@ -20,21 +13,28 @@ version:=${module.version}
 CC=gcc
 VPATH=${top_srcdir}/src:${top_srcdir}/doc
 
-GLOBUS_CPPFLAGS:=-I${globus_prefix}/include/${thrflavour}
 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 \
+ifeq (${thrflavour},)
+LIBS:=-L${stagedir}/${libdir} \
+       -lglite_lb_common \
+       -lglite_lb_client \
+       -lpthread -lglite_security_gss
+else
+LIBS:=-L${stagedir}/${libdir} -L${stagedir}/lib \
        -lglite_lb_common_${thrflavour} \
        -lglite_lb_client_${thrflavour} \
        -lpthread -lglite_security_gss_${thrflavour}
+endif
 
 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:=${GLOBUS_CPPFLAGS} $(CPPFLAGS) -DWITH_OLD_LB=1
+GLOBUS_GSSAPI_GSI_CFLAGS?=-I${globus_prefix}/include/${thrflavour}
+CPPFLAGS:=${GLOBUS_GSSAPI_GSI_CFLAGS} $(CPPFLAGS) -DWITH_OLD_LB=1
 LIBS:=$(LIBS) -lglite_wmsutils_cjobid
 else
 LIBS:=$(LIBS) -lglite_jobid -lglite_lbu_trio -lglite_lbu_log

diff --git a/org.glite.lb.harvester/configure b/org.glite.lb.harvester/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.harvester/configure
+++ b/org.glite.lb.harvester/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 097219e..5e4e788 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -7,9 +7,6 @@ package=glite-lb-client
 version=0.0.0
 PREFIX=/opt/glite
 
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-
 -include Makefile.inc
 -include ../project/version.properties
 
@@ -41,6 +38,14 @@ else
        WS_INTERLOGD:=glite-lb-ws-interlogd
 endif
 
+ifeq (${thrflavour},)
+default_thrflavour=
+default_nothrflavour=
+else
+default_thrflavour=_${thrflavour}
+default_nothrflavour=_${nothrflavour}
+endif
+
 DEBUG:=-g -O0
 CFLAGS:=${CFLAGS} ${DEBUG} \
        -I${stagedir}/include -I${top_srcdir}/src \
@@ -68,8 +73,8 @@ EXT_LIB:=-lglite_lbu_trio -lglite_lbu_log
 
 GLITE_GSS_LIB:=-lglite_security_gss
 
-TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
-TEST_INC:=-I${cppunit_prefix}/include
+CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit
+CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include
 
 LOGD_OBJS:= logd_proto.o logd.o
 
@@ -117,35 +122,35 @@ default: all
 all compile: $(LOGD) $(INTERLOGD) $(NOTIF_INTERLOGD) ${MAN_GZ}
 
 glite-lb-logd: ${LOGD_OBJS}
-       ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB}
 
 glite-lb-logd-perf: ${LOGD_OBJS}
-       ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB}
 
 glite-lb-logd-nofile: ${LOGD_NOBJS}
-       ${LINK} -o $@ ${LOGD_NOBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${LOGD_NOBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB}
 
 glite-lb-logd-perf-nofile: ${LOGD_NOBJS}
-       ${LINK} -o $@ ${LOGD_NOBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${LOGD_NOBJS} ${COMMON_LIB}${default_nothrflavour} ${EXT_LIB}
 
 glite-lb-interlogd: ${INTERLOG_OBJS}
-       ${LINK} -o $@ ${INTERLOG_OBJS} ${COMMON_LIB}_${thrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${INTERLOG_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB}
 
 glite-lb-notif-interlogd: ${INTERLOG_NOBJS}
-       ${LINK} -o $@ ${INTERLOG_NOBJS} ${COMMON_LIB}_${thrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${INTERLOG_NOBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB}
 
 glite-lb-interlogd-perf: ${INTERLOG_PERF_OBJS}
-       ${LINK} -o $@ ${INTERLOG_PERF_OBJS} ${COMMON_LIB}_${thrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${INTERLOG_PERF_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB}
 
 glite-lb-interlogd-perf-empty: ${INTERLOG_EMPTY_OBJS}
-       ${LINK} -o $@ ${INTERLOG_EMPTY_OBJS} ${COMMON_LIB}_${thrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${INTERLOG_EMPTY_OBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB}
 
 glite-lb-ws-interlogd: ${INTERLOG_WOBJS}
-       ${LINK} -o $@ ${INTERLOG_WOBJS} ${COMMON_LIB}_${thrflavour} ${EXT_LIB}
+       ${LINK} -o $@ ${INTERLOG_WOBJS} ${COMMON_LIB}${default_thrflavour} ${EXT_LIB}
 
 #glite-lb-interlogd-perf-inline-empty: ${INTERLOG_INLINE_EMPTY_OBJS}
 #      ${LINK} -o $@ ${INTERLOG_INLINE_EMPTY_OBJS} \
-#              ${COMMON_LIB}_${thrflavour}
+#              ${COMMON_LIB}${default_thrflavour}
 
 ${MAN_GZ}: ${MAN}
        rm -f ${MAN_GZ} ${MAN}
@@ -162,14 +167,14 @@ check:
 # check.ll check.il
 
 #check.ll: logd_proto_test.o ll_test.o
-#      ${LINKXX} -o $@ ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${TEST_LIBS} $+
+#      ${LINKXX} -o $@ ${COMMON_LIB}${default_nothrflavour} ${EXT_LIBS} ${CPPUNIT_LIBS} $+
 #      ./check.ll
 
 check.ll:
        -echo commented out -- fix needed
 
 check.il: ${INTERLOG_TEST_OBJS}
-       ${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${TEST_LIBS} -lpthread $+
+       ${LINKXX} -o $@ ${COMMON_LIB}${default_thrflavour} ${GLITE_GSS_LIB}${default_nothrflavour} ${CPPUNIT_LIBS} -lpthread $+
 
 install:
        -mkdir -p ${PREFIX}/bin
@@ -217,10 +222,10 @@ logd_proto_test.o: %.o: %.c
        ${CC} ${CFLAGS} -c $< -o $@
 
 ll_test.o: %.o: %.cpp
-       ${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
+       ${CXX} ${CFLAGS} ${CPPUNIT_CFLAGS} -c $< -o $@
 
 il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest.o event_storeTest.o: %.o: %.cpp
-       ${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
+       ${CXX} ${CFLAGS} ${CPPUNIT_CFLAGS} -c $< -o $@
 
 clean:
        rm -rvf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ}

diff --git a/org.glite.lb.logger/configure b/org.glite.lb.logger/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.logger/configure
+++ b/org.glite.lb.logger/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index de3b47d..88a28b5 100644 (file)
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -20,11 +20,22 @@ AT3=${stagedir}/sbin/glite-lb-at3
 
 SUFFIXES = .T 
 
+ifneq (${classads_prefix},/usr)
+       classadslib := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib 
+endif
+ifneq (${expat_prefix},/usr)
+       expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib 
+endif
+CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/classad
+CLASSADS_LIBS?=${classadslib} -lclassad
+EXPAT_CFLAGS?=
+EXPAT_LIBS?=${expatlib} -lexpat
+
 DEBUG:=-g -O0 -Wall
 
 CFLAGS:= ${CFLAGS} \
        ${DEBUG} \
-       -I${classads_prefix}/include -I${classads_prefix}/include/classad \
+       ${CLASSADS_CFLAGS} \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
        -I${top_srcdir}/interface 
 
@@ -36,16 +47,14 @@ INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
-ifneq (${classads_prefix},/usr)
-       classadslib := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib 
+ifeq (${thrflavour},)
+default_flavour=
+else
+default_flavour=_${nothrflavour}
 endif
-
-classadslib := ${classadslib} -lclassad
-
-EXT_LIBS:=
-COMMON_LIBS:= -L${stagedir}/${libdir}  -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour}
-PLUGIN_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common_${nothrflavour}\
-       ${classadslib} -lstdc++ ${expatlib} -lexpat\
+COMMON_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common${defaultflavour} -lglite_security_gss${defaultflavour}
+PLUGIN_LIBS:= -L${stagedir}/${libdir} -lglite_lb_common${defaultflavour} \
+       ${CLASSADS_LIBS} -lstdc++ ${EXPAT_LIBS}
 
 PLUGIN_LOBJS:=seqcode_aux.lo process_event.lo process_event_pbs.lo process_event_condor.lo process_event_cream.lo lb_plugin.lo  process_event_file_transfer.lo process_event_file_transfer_collection.lo
 MACHINE_OBJS:=seqcode_aux.o process_event.o process_event_pbs.o process_event_condor.o process_event_cream.o process_event_file_transfer.o process_event_file_transfer_collection.o

diff --git a/org.glite.lb.state-machine/configure b/org.glite.lb.state-machine/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.state-machine/configure
+++ b/org.glite.lb.state-machine/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.types/configure b/org.glite.lb.types/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.types/configure
+++ b/org.glite.lb.types/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 6583a49..8bf872c 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -7,8 +7,6 @@ package=glite-lb-utils
 version=0.0.0
 PREFIX=/opt/glite
 
-nothrflavour=gcc32
-thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 gsoap_prefix=/opt/gsoap
 
@@ -26,13 +24,20 @@ SUFFIXES = .T
 
 DEBUG:=-g -O0 -Wall
 
+ifneq (${expat_prefix},/usr)
+       expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib
+endif
+EXPAT_CFLAGS?=-I${expat_prefix}/include
+EXPAT_LIB?=${expatlib} -lexpat
+GSOAP_CFLAGS?=-I${gsoap_prefix}/include -I${gsoap_prefix}/
+
 CFLAGS:= ${CFLAGS} \
        ${WS_CFLAGS} ${DEBUG} \
        -DVERSION=\"${version}\" \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
        -I${top_srcdir}/interface \
-       -I${expat_prefix}/include \
-       -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
+       ${EXPAT_CFLAGS} \
+       ${GSOAP_CFLAGS} \
        ${COVERAGE_FLAGS} \
        -D_GNU_SOURCE
 LDFLAGS:=${LDFLAGS} -L${stagedir}/${libdir}
@@ -45,16 +50,19 @@ INSTALL:=libtool --mode=install install
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 XSLTPROC:=xsltproc --novalid
 
-ifneq (${expat_prefix},/usr)
-       expatlib := -L${expat_prefix}/${libdir} -L${expat_prefix}/lib
-endif
+EXT_LIBS:= ${EXPAT_LIBS}
 
-EXT_LIBS:= \
-       ${expatlib} -lexpat
+ifeq (${thrflavour},)
+COMMON_LIB:=-lglite_lb_common
+CLIENT_LIB:=-lglite_lb_client
+PLUS_LIB:=-lglite_lb_clientpp
+JP_LIBS:=-lglite_jp_common
+else
 COMMON_LIB:=-lglite_lb_common_${nothrflavour}
 CLIENT_LIB:=-lglite_lb_client_${nothrflavour}
 PLUS_LIB:=-lglite_lb_clientpp_${nothrflavour}
 JP_LIBS:=-lglite_jp_common_${nothrflavour}
+endif
 
 UTILS:=mon purge dump load dump_exporter
 ALLUTILS:=${UTILS} state_history statistics

diff --git a/org.glite.lb.utils/configure b/org.glite.lb.utils/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.utils/configure
+++ b/org.glite.lb.utils/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index e419693..42ed623 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -5,8 +5,6 @@ PREFIX=/opt/glite
 
 glite_location=/opt/glite
 globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
 expat_prefix=/opt/expat
 cares_prefix=/opt/c-ares
 gsoap_prefix=/opt/gsoap
@@ -23,12 +21,20 @@ CEXAMPLES:=ws_getversion ws_jobstat ws_joblog ws_lb4agu_GetActivityStatus ws_lb4
 
 default all: ${CEXAMPLES}
 
+GLOBUS_GSSAPI_GSI_CFLAGS?=-I${globus_prefix}/include/${nothrflavour}
+
+ifeq (${thrflavour},)
+default_flavour=
+else
+default_flavour=_${nothrflavour}
+endif
+
 VPATH=${top_srcdir}/examples
 CC=gcc
 DEBUG:=-g -O0 -Wall
 CFLAGS:=${CFLAGS} -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
-       -I${globus_prefix}/include/${nothrflavour} \
+       ${GLOBUS_GSSAPI_GSI_CFLAGS} \
        ${DEBUG}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
@@ -37,10 +43,10 @@ INSTALL:=libtool --mode=install install
 
 GSOAP_FILES_PREFIX:= bk_ws_
 dotless_gsoap_ver:=${shell echo ${gsoap_default_version} | tr -d . }
-ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}_c.so && echo ok),ok)
        langflavour:=_c
 endif
-GSOAP_LIB:=-L${stagedir}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
+GSOAP_LIB:=-L${stagedir}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}${default_flavour}${langflavour}
 
 WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o
 # ws_typeref.o

diff --git a/org.glite.lb.ws-test/configure b/org.glite.lb.ws-test/configure
index b81f8e0..dba8bf2 100755 (executable)
--- a/org.glite.lb.ws-test/configure
+++ b/org.glite.lb.ws-test/configure
@@ -104,8 +104,8 @@ my @opts = (
        'prefix=s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
-       'thrflavour=s' => \$thrflavour,
-       'nothrflavour=s' => \$nothrflavour,
+       'thrflavour:s' => \$thrflavour,
+       'nothrflavour:s' => \$nothrflavour,
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,