Fix and document --with-plugindir; partially from Diego Elio Petteno

diff --git a/INSTALL b/INSTALL
index a60bbd0323b3bec9361cb86ee9e609e0bce403ab..b8156e64c7c0d5365af9be933c88fef6b580865c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -134,6 +134,10 @@ Special features/options:
        `-l' will be prepended to it.  Multiple libraries may be
        specified as long as they are space separated.
 
+  --with-plugindir=PATH
+       Set the directory that sudo looks in to find the policy and I/O
+       logging plugins.  Defaults to the libexec dir used by configure.
+
   --with-efence
        Link with the "electric fence" debugging malloc.
 
@@ -144,6 +148,11 @@ Special features/options:
   --with-csops
        Add CSOps standard options.  You probably aren't interested in this.
 
+  --with-devel
+        Configure development options.  This will enable compiler warnings
+       and set the Makefile to be able to regenerate the sudoers parser
+       as well as the manual pages.
+
   --with-linux-audit
        Enable audit support for Linux systems.  Audits attempts
        to run a command as well as SELinux role changes.

diff --git a/configure b/configure
index 55160ade8094d76bdab4c47497e2e4361b3b2e92..6e76452cf8f2f4bf1b0efb2851857ffc3602a72e 100755 (executable)
--- a/configure
+++ b/configure
@@ -846,7 +846,7 @@ with_secure_path
 with_interfaces
 with_stow
 with_askpass
-with_plugin_dir
+with_plugindir
 enable_authentication
 enable_root_mailer
 enable_setreuid
@@ -1616,7 +1616,7 @@ Optional Packages:
   --without-interfaces    don't try to read the ip addr of ether interfaces
   --with-stow             properly handle GNU stow packaging
   --with-askpass=PATH     Fully qualified pathname of askpass helper
-  --with-plugin_dir       set directory to load plugins from
+  --with-plugindir        set directory to load plugins from
   --with-selinux          enable SELinux support
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
@@ -5155,15 +5155,16 @@ $as_echo "no" >&6; }
 fi
 
 
-with_plugindir="$libexecdir"
 
-# Check whether --with-plugin_dir was given.
-if test "${with_plugin_dir+set}" = set; then :
-  withval=$with_plugin_dir; case $with_plugin_dir in
-    no)                as_fn_error "\"illegal argument: --without-plugin_dir.\"" "$LINENO" 5
+# Check whether --with-plugindir was given.
+if test "${with_plugindir+set}" = set; then :
+  withval=$with_plugindir; case $with_plugindir in
+    no)                as_fn_error "\"illegal argument: --without-plugindir.\"" "$LINENO" 5
                ;;
     *)         ;;
 esac
+else
+  with_plugindir="$libexecdir"
 fi
 
 

diff --git a/configure.in b/configure.in
index 85f6a614f3a2a720e22a8ae409e5c0c8b5fa65ac..235e9142a2e7eeab98e5ebd213afd6964637d205 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1097,13 +1097,12 @@ AC_ARG_WITH(askpass, [AS_HELP_STRING([--with-askpass=PATH], [Fully qualified pat
                ;;
 esac], AC_MSG_RESULT(no))
 
-with_plugindir="$libexecdir"
-AC_ARG_WITH(plugin_dir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
-[case $with_plugin_dir in
-    no)                AC_MSG_ERROR(["illegal argument: --without-plugin_dir."])
+AC_ARG_WITH(plugindir, [AS_HELP_STRING([--with-plugindir], [set directory to load plugins from])],
+[case $with_plugindir in
+    no)                AC_MSG_ERROR(["illegal argument: --without-plugindir."])
                ;;
     *)         ;;
-esac])
+esac], [with_plugindir="$libexecdir"])
 
 dnl
 dnl Options for --enable