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

diff --git a/configure b/configure
index a8d9ba428aceb6c10822de520e7009dae3b57394..ecdd8bff05864147a8b814035d0a573f7256fc60 100755 (executable)
--- 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 384dd6437b0238a8ef0f1721d2dea7e2311f5a84..d48411c13ab3967fe2a23f12c573a7daaacb0406 100644 (file)
--- 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