the first attempt to fix #9701

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 93708e8..208fbd7 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -49,9 +49,9 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
 
 VERSION_AHEAD=0
 
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-        -lglobus_common_${nothrflavour} \
-        -lglobus_gssapi_gsi_${nothrflavour} \
+#GLOBUS_LIBS:=-L${globus_prefix}/lib \
+#        -lglobus_common_${nothrflavour} \
+#        -lglobus_gssapi_gsi_${nothrflavour} \
 
 GLITE_LIBS:=-L${glite_location}/lib
 
@@ -80,6 +80,8 @@ LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS}
 LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
+LTSPLIT:=${top_srcdir}/project/libtool-paths-split.pl
+
 OBJS:=lb_plain_io.o escape.o events.o mini_http.o query_rec.o \
        status.o xml_conversions.o xml_parse.o ulm_parse.o param.o \
        events_parse.o il_string.o il_int.o notifid.o \
@@ -141,12 +143,14 @@ ${LTLIB}: ${OBJS}
        ${LINK} ${version_info} -o $@ ${LOBJS} \
                -lglite_security_gss_${nothrflavour} \
                -lglite_wmsutils_cjobid \
+               ${EXT_LIBS} \
                -lm
 
 ${THRLTLIB}: ${THROBJS}
        ${LINK} ${version_info} -o $@ ${THRLOBJS} \
                -lglite_security_gss_${thrflavour} \
                -lglite_wmsutils_cjobid \
+               ${EXT_LIBS} \
                -lm
 
 stage: compile
@@ -192,6 +196,7 @@ install:
        mkdir -p ${PREFIX}/lib
        mkdir -p ${PREFIX}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${PREFIX}/lib
+       ${LTSPLIT} ${PREFIX}/lib/${LTLIB} ${PREFIX}/lib/${THRLTLIB}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        if [ x${DOSTAGE} = xyes ]; then \
                mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ; \

diff --git a/org.glite.lb.common/build.xml b/org.glite.lb.common/build.xml
index e3add29..638bc67 100755 (executable)
--- a/org.glite.lb.common/build.xml
+++ b/org.glite.lb.common/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.8  2005/08/03 09:30:17  akrenek
+       Merged the release 1.0 branch
+       
        Revision 1.7  2005/05/26 15:13:46  zurek
        inserted module.build.file
        
@@ -114,8 +117,12 @@
                                <include name="at3" />
                                <include name="*.T" />
                                <include name="*.pm" />
+                               <include name="libtool-paths-split.pl" />
                        </fileset>
                </copy> 
+               <exec dir="${module.project.dir}" executable="chmod">
+                       <arg line="+x libtool-paths-split.pl"/>
+               </exec>
                <antcall target="lbmakefiles" />
        </target>