mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#9008 moduledir rpath changes

Browse Source
This commit is contained in:
Emily Backes 2015-02-05 18:16:55 -08:00 committed by Ondřej Kuzník
parent c42c996966
commit 469bc3afbf
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/top.mk
View File

@ -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)

33
configure.in
View File

@ -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=