Index: openldap-2.4.11-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v
retrieving revision 1.5
diff -u -r1.5 openldap-2.4.11-r1.ebuild
--- openldap-2.4.11-r1.ebuild	15 Jan 2009 11:12:28 -0000	1.5
+++ openldap-2.4.11-r1.ebuild	4 Mar 2009 16:43:30 -0000
@@ -192,9 +192,16 @@
 	# <dir> <sources> <outputname>
 	cd "${S}/contrib/slapd-modules/$1"
 	einfo "Building contrib-module: $3"
-	$(tc-getCC) -shared \
-		-I../../../include -I../../../servers/slapd ${CFLAGS} -fPIC \
-		${LDFLAGS} -o $3.so $2 || die "building $3 failed"
+	"${S}"/libtool --mode=compile --tag=CC \
+		$(tc-getCC) \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	"${S}"/libtool --mode=link --tag=CC \
+		$(tc-getCC) -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath /usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
 }
 
 src_configure() {
@@ -294,25 +301,38 @@
 		if use kerberos ; then
 			cd "${S}/contrib/slapd-modules/passwd"
 			einfo "Building contrib-module: pw-kerberos"
-			$(tc-getCC) -shared \
+			"${S}"/libtool --mode=compile --tag=CC \
+				$(tc-getCC) \
 				-I../../../include \
 				${CFLAGS} \
 				$(krb5-config --cflags) \
-				-DHAVE_KRB5 -fPIC \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			"${S}"/libtool --mode=link --tag=CC \
+				$(tc-getCC) -module \
+				${CFLAGS} \
 				${LDFLAGS} \
-				-o pw-kerberos.so \
-				kerberos.c || die "building pw-kerberos failed"
+				-rpath /usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
 		fi
 		# We could build pw-radius if GNURadius would install radlib.h
 		cd "${S}/contrib/slapd-modules/passwd"
 		einfo "Building contrib-module: pw-netscape"
-		$(tc-getCC) -shared \
+		"${S}"/libtool --mode=compile --tag=CC \
+			$(tc-getCC) \
 			-I../../../include \
 			${CFLAGS} \
-			-fPIC \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		"${S}"/libtool --mode=link --tag=CC \
+			$(tc-getCC) -module \
+			${CFLAGS} \
 			${LDFLAGS} \
-			-o pw-netscape.so \
-			netscape.c || die "building pw-netscape failed"
+			-rpath /usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
 
 		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
 		build_contrib_module "allop" "allop.c" "overlay-allop"
@@ -388,8 +408,11 @@
 
 		einfo "Installing contrib modules"
 		cd "${S}/contrib/slapd-modules"
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins  */*.so
+		for l in */*.la; do
+			"${S}"/libtool --mode=install cp ${l} \
+				"${D}"usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
 		docinto contrib
 		newdoc addpartial/README addpartial-README
 		newdoc allop/README allop-README