From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 18 Feb 2016 23:18:30 +0000 (-0700)
Subject: Remove last remnants of the deprecated --with-stow option.
X-Git-Tag: SUDO_1_8_16^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f7b0b11590c03245b1cf314274a030e64c2eb65;p=sudo

Remove last remnants of the deprecated --with-stow option.
---

diff --git a/configure b/configure
index 66560b7f9..9a328c7c4 100755
--- a/configure
+++ b/configure
@@ -920,7 +920,6 @@ with_ldap_secret_file
 with_pc_insults
 with_secure_path
 with_interfaces
-with_stow
 with_askpass
 with_exampledir
 with_plugindir
@@ -1730,7 +1729,6 @@ Optional Packages:
                           offensive ones
   --with-secure-path      override the user's path with a built-in one
   --without-interfaces    don't try to read the ip addr of ether interfaces
-  --with-stow             deprecated
   --with-askpass=PATH     Fully qualified pathname of askpass helper
   --with-exampledir=DIR   path to install sudo examples in
   --with-plugindir=DIR    set directory to load plugins from
@@ -5686,17 +5684,6 @@ $as_echo "yes" >&6; }
 fi
 
 
-
-# Check whether --with-stow was given.
-if test "${with_stow+set}" = set; then :
-  withval=$with_stow; case $with_stow in
-    *)		{ $as_echo "$as_me:${as_lineno-$LINENO}: --with-stow option deprecated, now is defalt behavior" >&5
-$as_echo "$as_me: --with-stow option deprecated, now is defalt behavior" >&6;}
-		;;
-esac
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use an askpass helper" >&5
 $as_echo_n "checking whether to use an askpass helper... " >&6; }
 
@@ -24362,7 +24349,7 @@ test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
 test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
 test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
 test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
-test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
 
 if test X"$INIT_SCRIPT" != X""; then
     ac_config_files="$ac_config_files init.d/$INIT_SCRIPT"
diff --git a/configure.ac b/configure.ac
index 01214f9ae..d5aba59b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1182,12 +1182,6 @@ AC_ARG_WITH(interfaces, [AS_HELP_STRING([--without-interfaces], [don't try to re
 		;;
 esac], AC_MSG_RESULT(yes))
 
-AC_ARG_WITH(stow, [AS_HELP_STRING([--with-stow], [deprecated])],
-[case $with_stow in
-    *)		AC_MSG_NOTICE([--with-stow option deprecated, now is defalt behavior])
-		;;
-esac])
-
 AC_MSG_CHECKING(whether to use an askpass helper)
 AC_ARG_WITH(askpass, [AS_HELP_STRING([--with-askpass=PATH], [Fully qualified pathname of askpass helper])],
 [case $with_askpass in
@@ -4202,7 +4196,7 @@ test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
 test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
 test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
 test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
-test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
 
 dnl
 dnl Substitute into the Makefile and man pages