candidate solution for #9701 -- use chrpath

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 4fe13c8..21b7c80 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -110,7 +110,7 @@ CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS}
 LINK:=libtool --mode=link ${CC} ${LDFLAGS} 
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
-LTSPLIT:=${top_srcdir}/project/libtool-paths-split.pl
+CHRPATH:=${chrpath}/bin/chrpath
 
 LIBOBJS:=connection.o consumer.o notification.o prod_proto.o \
        producer.o uiwrap.o statistics.o
@@ -154,46 +154,46 @@ version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :`
 ${LIB}: ${LIBOBJS}
        ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib \
                        -lglite_lb_common_${nothrflavour} \
-                       -lglite_security_gss_${nothrflavour}
-       ${LTSPLIT} $@
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${THRLIB}: ${LIBTHROBJS}
        ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib \
                        -lglite_lb_common_${thrflavour} \
-                       -lglite_security_gss_${thrflavour}
-       ${LTSPLIT} $@
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${FAKELIB}: ${FAKELIBOBJS}
        ${LINK} ${version_info} -o $@ ${FAKELIBLOBJS} -rpath ${glite_location}/lib \
                        -lglite_lb_common_${nothrflavour} \
-                       -lglite_security_gss_${nothrflavour}
-       ${LTSPLIT} $@
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${FAKETHRLIB}: ${FAKELIBTHROBJS}
        ${LINK} ${version_info} -o $@ ${FAKELIBTHRLOBJS} -rpath ${glite_location}/lib \
                        -lglite_lb_common_${thrflavour} \
-                       -lglite_security_gss_${thrflavour}
-       ${LTSPLIT} $@
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${PLUSLIB}: ${PLUSOBJS}
        ${LINK} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${glite_location}/lib ${LIB}
-       ${LTSPLIT} $@
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${THRPLUSLIB}: ${PLUSTHROBJS}
        ${LINK} ${version_info} -o $@ ${PLUSTHRLOBJS} -rpath ${glite_location}/lib ${THRLIB}
-       ${LTSPLIT} $@
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 logevent: logevent.o args.o
        ${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB} ${GLOBUS_LIBS}
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${TOOLS} ${EXAMPLES}: %: %.o
        ${LINK} -o $@ $< ${LIB} ${EXT_LIB} ${GLOBUS_LIBS}
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${EXAMPLES_CL}: %: %.o
        ${LINK} -o $@ $< ${LIB} ${COMMON_LIB} ${EXT_LIB} ${GLOBUS_LIBS}
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${FAKE_EXAMPLES}: %: %.o ${FAKELIB}
        ${LINK} -o $@ $< ${FAKELIB} ${TEST_LIBS} ${EXT_LIB} ${GLOBUS_LIBS}
+       ${CHRPATH} -d .libs/${@:.la=.so}
 
 ${TOOLS}: ${LIB}
 
@@ -285,7 +285,6 @@ install:
        mkdir -p ${PREFIX}/share/doc/${package}-${version}
        mkdir -p ${PREFIX}/share/man/man1
        ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${PREFIX}/lib
-       ${LTSPLIT} ${PREFIX}/lib/${LIB} ${PREFIX}/lib/${THRLIB} ${PREFIX}/lib/${PLUSLIB} ${PREFIX}/lib/${THRPLUSLIB}
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${top_srcdir}/doc/README-fake ${top_srcdir}/doc/README-notify ${PREFIX}/share/doc/${package}-${version}
        mkdir -p ${PREFIX}/examples

diff --git a/org.glite.lb.client/build.xml b/org.glite.lb.client/build.xml
index 48203c4..1e21625 100755 (executable)
--- a/org.glite.lb.client/build.xml
+++ b/org.glite.lb.client/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.6.6.1  2005/09/21 12:13:26  akrenek
+       the first attempt to fix #9701
+       
        Revision 1.6  2005/05/26 15:13:40  zurek
        inserted module.build.file
        
@@ -110,9 +113,6 @@
                                <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>
                

diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index 17c4c40..dcf1c14 100644 (file)
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.3  2004/08/31 16:32:31  jpospi
+       First attempt to producer test
+       
        Revision 1.2  2004/07/06 20:47:11  flammer
        Moved to configure.properties.xml
        
@@ -52,6 +55,7 @@ nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 ares_prefix=${with.ares.prefix}
 cppunit_prefix=${with.cppunit.prefix}
+chrpath=${with.chrpath.prefix}
                        </echo>
            </target>
        </project>