From c849d80e4a888d4ec7ae8b05855d1a85b2d65ca5 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@h3c.de>
Date: Fri, 21 Sep 2007 15:11:49 +0200
Subject: [PATCH] Add pre-depend, add rpath for Solaris and POSIX.

---
 buildsys.mk.in  | 4 +++-
 m4/sharedlib.m4 | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/buildsys.mk.in b/buildsys.mk.in
index 16e1ad7..774235a 100644
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
@@ -82,7 +82,7 @@ subdirs:
 		${DIR_LEAVE}; \
 	done
 
-depend:
+depend: pre-depend
 	regen=0; \
 	for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \
 	if [ $$regen = 1 ]; then \
@@ -95,6 +95,8 @@ depend:
 		done; \
 	fi
 
+pre-depend:
+
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
 	${LINK_STATUS}
 	if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \
diff --git a/m4/sharedlib.m4 b/m4/sharedlib.m4
index 550fee8..06b503e 100644
--- a/m4/sharedlib.m4
+++ b/m4/sharedlib.m4
@@ -53,7 +53,7 @@ AC_DEFUN([AM_SHARED_LIB], [
 			AC_MSG_RESULT(Solaris)
 			LIB_CPPFLAGS='-DPIC'
 			LIB_CFLAGS='-fPIC'
-			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR} -Wl,-R ${libdir}'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.so'
 			PLUGIN_CPPFLAGS='-DPIC'
@@ -81,7 +81,7 @@ AC_DEFUN([AM_SHARED_LIB], [
 			AC_MSG_RESULT(POSIX)
 			LIB_CPPFLAGS='-DPIC'
 			LIB_CFLAGS='-fPIC'
-			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0'
+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0 -Wl,-R ${libdir}'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.so'
 			PLUGIN_CPPFLAGS='-DPIC'