Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Lukas However
OpenLDAP
Commits
469bc3af
Commit
469bc3af
authored
Feb 05, 2015
by
Emily Backes
Committed by
Ondřej Kuzník
Apr 24, 2019
Browse files
ITS#9008 moduledir rpath changes
parent
c42c9969
Changes
2
Hide whitespace changes
Inline
Side-by-side
build/top.mk
View file @
469bc3af
...
...
@@ -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
$(
module
dir)
UNIX_LTFLAGS_MOD
=
$(LTVERSION)
-rpath
$(
lib
dir)
# libtool flags
LTFLAGS
=
$
(
@PLAT@_LTFLAGS
)
...
...
configure.in
View file @
469bc3af
...
...
@@ -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=
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment