summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/m4/check_path.m418
2 files changed, 0 insertions, 19 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b37f3158ed..299a9ec48c 100644
--- 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 65db076ee6..1d65846e70 100644
--- 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"
@@ -71,22 +70,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,
[AS_HELP_STRING([--with-lockdir=DIR], [Where to put lock files ($ac_default_prefix/var/locks)])],
@@ -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)