From 4802f0982174a5a073aae3da733114d99272e6f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= <ljocha@ics.muni.cz>
Date: Thu, 22 Sep 2005 15:32:43 +0000
Subject: [PATCH] candidate solution for #9701 -- use chrpath

---
 org.glite.lb.logger/Makefile                       | 26 +++++++++++++---------
 .../project/configure.properties.xml               |  4 ++++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 5f9cb69..5d806e0 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -43,21 +43,22 @@ LDFLAGS:=-L${stagedir}/lib \
 LINK:=libtool --mode=link ${CC} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
+CHRPATH:=${chrpath}/bin/chrpath
 
-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}
 
-GLOBUS_THRLIBS:= -L${globus_prefix}/lib \
-	-lglobus_common_${thrflavour} \
-	-lglobus_gssapi_gsi_${thrflavour}
+#GLOBUS_THRLIBS:= -L${globus_prefix}/lib \
+#	-lglobus_common_${thrflavour} \
+#	-lglobus_gssapi_gsi_${thrflavour}
 
-ifneq (${expat_prefix},/usr)
-	EXPAT_LIBS:=-L${expat_prefix}/lib
-endif
-EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
+#ifneq (${expat_prefix},/usr)
+#	EXPAT_LIBS:=-L${expat_prefix}/lib
+#endif
+#EXPAT_LIBS:=${EXPAT_LIBS} -lexpat
 
-EXT_LIBS:= -L${ares_prefix}/lib -lares ${EXPAT_LIBS}
+#EXT_LIBS:= -L${ares_prefix}/lib -lares ${EXPAT_LIBS}
 
 COMMON_LIB:=-lglite_lb_common
 GLITE_GSS_LIB:=-lglite_security_gss
@@ -93,18 +94,21 @@ INTERLOG_TEST_OBJS:= \
 
 glite_lb_logd: ${LOGD_OBJS}
 	${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS}
+	${CHRPATH} -d $@
 
 glite_lb_interlogd: ${INTERLOG_OBJS}
 	${LINK} -o $@ ${INTERLOG_OBJS} \
 		${COMMON_LIB}_${thrflavour} \
 		${GLITE_GSS_LIB}_${nothrflavour} \
 		${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
+	${CHRPATH} -d $@
 
 glite_lb_notif_interlogd: ${INTERLOG_NOBJS}
 	${LINK} -o $@ ${INTERLOG_NOBJS} \
 		${COMMON_LIB}_${thrflavour} \
 		${GLITE_GSS_LIB}_${nothrflavour} \
 		${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
+	${CHRPATH} -d $@
 
 default: all
 
diff --git a/org.glite.lb.logger/project/configure.properties.xml b/org.glite.lb.logger/project/configure.properties.xml
index 0e51395..34bbbc6 100644
--- a/org.glite.lb.logger/project/configure.properties.xml
+++ b/org.glite.lb.logger/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
 	Revision history:
 	$Log$
+	Revision 1.2  2004/08/31 13:44:44  mvocu
+	* added cppunit
+	
 	Revision 1.1  2004/07/07 12:08:47  akrenek
 	*** empty log message ***
 	
@@ -55,6 +58,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>
-- 
1.8.2.3