isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update plugindir even when --disable-shared is specified.

Browse Source 
Otherwise, the default value is substituted into the Makefiles and
documentation which may not match --prefix.  Bug #886
This commit is contained in:
Todd C. Miller
2019-07-03 07:39:54 -06:00
parent 9d8f374397
commit 6e497be935
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@@ -26930,13 +26930,14 @@ EOF
EOF EOF
fi fi
# PLUGINDIR gets substitured even when --disable-shared is specified
PLUGINDIR="$with_plugindir"
_PLUGINDIR=
while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
_PLUGINDIR="$PLUGINDIR"
eval PLUGINDIR="$_PLUGINDIR"
done
if test X"$enable_shared" != X"no"; then if test X"$enable_shared" != X"no"; then
PLUGINDIR="$with_plugindir"
_PLUGINDIR=
while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
_PLUGINDIR="$PLUGINDIR"
eval PLUGINDIR="$_PLUGINDIR"
done
cat >>confdefs.h <<EOF cat >>confdefs.h <<EOF
#define _PATH_SUDO_PLUGIN_DIR "$PLUGINDIR/" #define _PATH_SUDO_PLUGIN_DIR "$PLUGINDIR/"
EOF EOF

13
configure.ac
View File

@@ -4404,13 +4404,14 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no" -o "$enabled_share
done done
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, "$sesh_file") SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, "$sesh_file")
fi fi
# PLUGINDIR gets substitured even when --disable-shared is specified
PLUGINDIR="$with_plugindir"
_PLUGINDIR=
while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
_PLUGINDIR="$PLUGINDIR"
eval PLUGINDIR="$_PLUGINDIR"
done
if test X"$enable_shared" != X"no"; then if test X"$enable_shared" != X"no"; then
PLUGINDIR="$with_plugindir"
_PLUGINDIR=
while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
_PLUGINDIR="$PLUGINDIR"
eval PLUGINDIR="$_PLUGINDIR"
done
SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$PLUGINDIR/") SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$PLUGINDIR/")
AC_DEFINE(ENABLE_SUDO_PLUGIN_API, 1, [Define to 1 to enable sudo's plugin interface.]) AC_DEFINE(ENABLE_SUDO_PLUGIN_API, 1, [Define to 1 to enable sudo's plugin interface.])
fi fi