From 469bc3afbfc478fdce80ee269fd01d2fefa92010 Mon Sep 17 00:00:00 2001
From: Emily Backes <ebackes@symas.com>
Date: Thu, 5 Feb 2015 18:16:55 -0800
Subject: [PATCH] ITS#9008 moduledir rpath changes

---
 build/top.mk | 10 ++++++----
 configure.in | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/build/top.mk b/build/top.mk
index 2420510c79..ddfa48777d 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -40,7 +40,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-moduledir = @libexecdir@$(ldap_subdir)
+moduledir = @moduledir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@$(ldap_subdir)
@@ -87,10 +87,12 @@ LTONLY_mod = --tag=disable-static
 LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
 
 # platform-specific libtool flags
-NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
-NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir)
+NT_LTFLAGS = -no-undefined -avoid-version -rpath $(libdir)
+NT_LTFLAGS_LIB = -no-undefined $(LTVERSION) -rpath $(libdir)
+NT_LTFLAGS_MOD = -no-undefined $(LTVERSION) -rpath $(libdir)
+UNIX_LTFLAGS = $(LTVERSION) -rpath $(libdir)
 UNIX_LTFLAGS_LIB = $(LTVERSION) -rpath $(libdir)
-UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(moduledir)
+UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(libdir)
 
 # libtool flags
 LTFLAGS     = $(@PLAT@_LTFLAGS)
diff --git a/configure.in b/configure.in
index 9b3fdccbe2..97972cdedf 100644
--- a/configure.in
+++ b/configure.in
@@ -226,6 +226,24 @@ esac
 
 AC_SUBST(ldap_subdir)dnl
 
+dnl ----------------------------------------------------------------
+dnl --with-moduledir
+
+moduledir="openldap"
+
+AC_ARG_WITH(moduledir,
+[  --with-moduledir=DIR    change default module subdirectory used for installs],
+[case "$withval" in
+	no) moduledir=""
+		;;
+	yes)
+		;;
+	*)
+		moduledir="$withval"
+		;;
+esac
+])dnl
+
 dnl ----------------------------------------------------------------
 dnl General "enable" options
 dnl set default to traditional to enable the original debug style
@@ -531,6 +549,21 @@ fi
 AC_MSG_RESULT(done)
 
 dnl ----------------------------------------------------------------
+
+dnl set moduledir- if moduledir starts with a /, then leave it alone.
+dnl otherwise, prepend libexecdir to it.
+case $moduledir in
+	/*|\\*)
+		;;
+	*)
+		moduledir=$libexecdir/$moduledir
+		;;
+esac
+
+AC_SUBST(moduledir)
+
+dnl ----------------------------------------------------------------
+
 dnl Initialize vars
 LDAP_LIBS=
 BDB_LIBS=