From 6e497be935fdb46c13bd94b82f1486a9c659bdac Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Wed, 3 Jul 2019 07:39:54 -0600
Subject: [PATCH] Update plugindir even when --disable-shared is specified.
 Otherwise, the default value is substituted into the Makefiles and
 documentation which may not match --prefix.  Bug #886

---
 configure    | 13 +++++++------
 configure.ac | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index a8d9ba428..ecdd8bff0 100755
--- a/configure
+++ b/configure
@@ -26930,13 +26930,14 @@ EOF
 EOF
 
     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
-	PLUGINDIR="$with_plugindir"
-	_PLUGINDIR=
-	while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
-	    _PLUGINDIR="$PLUGINDIR"
-	    eval PLUGINDIR="$_PLUGINDIR"
-	done
 	cat >>confdefs.h <<EOF
 #define _PATH_SUDO_PLUGIN_DIR "$PLUGINDIR/"
 EOF
diff --git a/configure.ac b/configure.ac
index 384dd6437..d48411c13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4404,13 +4404,14 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no" -o "$enabled_share
 	done
 	SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, "$sesh_file")
     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
-	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/")
 	AC_DEFINE(ENABLE_SUDO_PLUGIN_API, 1, [Define to 1 to enable sudo's plugin interface.])
     fi