s3:configure: remove unused --with-rootsbindir configure option

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jun 24 23:57:20 CEST 2011 on sn-devel-104

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b37f3158ed7422428962d424b8b2a752cf285541..299a9ec48c04b6d73128e294df9f82087c0a2b92 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -121,7 +121,6 @@ BASEDIR= @prefix@
 BINDIR = @bindir@
 # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
 SBINDIR = @sbindir@
-ROOTSBINDIR = @rootsbindir@
 LIBDIR = @libdir@
 MODULESDIR = @modulesdir@
 INCLUDEDIR=@includedir@

diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index 65db076ee61a00ed2cd856821b8d775ba60b8329..1d65846e70966a41884a37d126f2667cebccb53d 100644 (file)
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -15,7 +15,6 @@ AC_LIBREPLACE_LOCATION_CHECKS
 # ones...
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
-rootsbindir="\${SBINDIR}"
 lockdir="\${VARDIR}/locks"
 piddir="\${VARDIR}/locks"
 ncalrpcdir="\${VARDIR}/ncalrpc"
@@ -70,22 +69,6 @@ AC_ARG_WITH(privatedir,
     ;;
   esac])
 
-#################################################
-# set root sbin directory location
-AC_ARG_WITH(rootsbindir,
-[AS_HELP_STRING([--with-rootsbindir=DIR], [Which directory to use for root sbin ($ac_default_prefix/sbin)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-rootsbindir called without argument - will use default])
-  ;;
-  * )
-    rootsbindir="$withval"
-    ;;
-  esac])
-
 #################################################
 # set lock directory location
 AC_ARG_WITH(lockdir,
@@ -325,7 +308,6 @@ AC_SUBST(sbindir)
 AC_SUBST(codepagedir)
 AC_SUBST(statedir)
 AC_SUBST(cachedir)
-AC_SUBST(rootsbindir)
 AC_SUBST(pammodulesdir)
 AC_SUBST(modulesdir)
 AC_SUBST(localedir)