From 7364f0ce98f82c823b0d52b79c6941d449c6be57 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Tue, 2 Apr 2013 12:25:54 -0400
Subject: [PATCH] Do exec_prefix expansion when enable_shared even if noexec is
 not enabled.

---
 configure    | 20 +++++++++++---------
 configure.in | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index 40d938779..28259c5ad 100755
--- a/configure
+++ b/configure
@@ -21302,7 +21302,7 @@ CROSS_COMPILING="$cross_compiling"
 
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
 
-if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
+if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no" -o "$enabled_shared" != X"no"; then
     oexec_prefix="$exec_prefix"
     if test "$exec_prefix" = '$(prefix)'; then
 	if test "$prefix" = "NONE"; then
@@ -21338,20 +21338,22 @@ EOF
 EOF
 
     fi
-    PLUGINDIR="$with_plugindir"
-    _PLUGINDIR=
-    while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
-	_PLUGINDIR="$PLUGINDIR"
-	eval PLUGINDIR="$_PLUGINDIR"
-    done
-    cat >>confdefs.h <<EOF
+    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
 
-    cat >>confdefs.h <<EOF
+	cat >>confdefs.h <<EOF
 #define SUDOERS_PLUGIN "sudoers.so"
 EOF
 
+    fi
     exec_prefix="$oexec_prefix"
 fi
 if test X"$with_selinux" = X"no"; then
diff --git a/configure.in b/configure.in
index 3eb4e42a5..ccc4c9387 100644
--- a/configure.in
+++ b/configure.in
@@ -3537,7 +3537,7 @@ dnl
 dnl Defer setting _PATH_SUDO_NOEXEC until after exec_prefix is set
 dnl XXX - this is gross!
 dnl
-if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
+if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no" -o "$enabled_shared" != X"no"; then
     oexec_prefix="$exec_prefix"
     if test "$exec_prefix" = '$(prefix)'; then
 	if test "$prefix" = "NONE"; then
@@ -3567,14 +3567,16 @@ if test X"$with_noexec" != X"no" -o X"$with_selinux" != X"no"; then
 	done
 	SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, "$sesh_file")
     fi
-    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(SUDOERS_PLUGIN, "sudoers.so")
+    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(SUDOERS_PLUGIN, "sudoers.so")
+    fi
     exec_prefix="$oexec_prefix"
 fi
 if test X"$with_selinux" = X"no"; then
-- 
2.50.0