Commit 35166673 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Revert "ITS#9008 moduledir rpath changes"

This reverts commit 469bc3af.
parent 1d0a96e7
...@@ -40,7 +40,7 @@ libdir = @libdir@ ...@@ -40,7 +40,7 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
moduledir = @moduledir@ moduledir = @libexecdir@$(ldap_subdir)
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@$(ldap_subdir) sysconfdir = @sysconfdir@$(ldap_subdir)
...@@ -87,12 +87,10 @@ LTONLY_mod = --tag=disable-static ...@@ -87,12 +87,10 @@ LTONLY_mod = --tag=disable-static
LTONLY_MOD = $(LTONLY_$(BUILD_MOD)) LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
# platform-specific libtool flags # platform-specific libtool flags
NT_LTFLAGS = -no-undefined -avoid-version -rpath $(libdir) NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
NT_LTFLAGS_LIB = -no-undefined $(LTVERSION) -rpath $(libdir) NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir)
NT_LTFLAGS_MOD = -no-undefined $(LTVERSION) -rpath $(libdir)
UNIX_LTFLAGS = $(LTVERSION) -rpath $(libdir)
UNIX_LTFLAGS_LIB = $(LTVERSION) -rpath $(libdir) UNIX_LTFLAGS_LIB = $(LTVERSION) -rpath $(libdir)
UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(libdir) UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(moduledir)
# libtool flags # libtool flags
LTFLAGS = $(@PLAT@_LTFLAGS) LTFLAGS = $(@PLAT@_LTFLAGS)
......
...@@ -226,24 +226,6 @@ esac ...@@ -226,24 +226,6 @@ esac
AC_SUBST(ldap_subdir)dnl 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 ----------------------------------------------------------------
dnl General "enable" options dnl General "enable" options
dnl set default to traditional to enable the original debug style dnl set default to traditional to enable the original debug style
...@@ -541,21 +523,6 @@ fi ...@@ -541,21 +523,6 @@ fi
AC_MSG_RESULT(done) AC_MSG_RESULT(done)
dnl ---------------------------------------------------------------- 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 dnl Initialize vars
LDAP_LIBS= LDAP_LIBS=
SLAPD_NDB_LIBS= SLAPD_NDB_LIBS=
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment