summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-07-13 11:26:12 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-13 16:36:18 +0200
commit46109a9f8a04115d709fa004fcadc5a6259c4bfa (patch)
tree54b911412b160c8eb246935f832b6501f5eb77ae /source3
parent9b3357c54e66eef62cd7bbb5d4c9acd3cacd9fcd (diff)
downloadsamba-46109a9f8a04115d709fa004fcadc5a6259c4bfa.tar.gz
samba-46109a9f8a04115d709fa004fcadc5a6259c4bfa.tar.bz2
samba-46109a9f8a04115d709fa004fcadc5a6259c4bfa.zip
s3:configure: use the same dynconfig options and default values as the toplevel build
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in142
-rw-r--r--source3/m4/check_path.m4303
2 files changed, 77 insertions, 368 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 146c9cb2f2..0a72cf579a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -16,6 +16,42 @@ sysconfdir=@sysconfdir@
localstatedir=@localstatedir@
datarootdir=@datarootdir@
+# the following vars come from ../dynconfig/config.m4
+BINDIR=@BINDIR@
+SBINDIR=@SBINDIR@
+LIBDIR=@LIBDIR@
+#LIBEXECDIR=@LIBEXECDIR@
+MANDIR=@MANDIR@
+DATADIR=@DATADIR@
+LOCALEDIR=@LOCALEDIR@
+#SCRIPTSBINDIR=@SCRIPTSBINDIR@
+#PYTHONDIR=@PYTHONDIR@
+#PYTHONARCHDIR=@PYTHONARCHDIR@
+MODULESDIR=@MODULESDIR@
+INCLUDEDIR=@INCLUDEDIR@
+SETUPDIR=@SETUPDIR@
+#PKGCONFIGDIR=@PKGCONFIGDIR@
+SWATDIR=@SWATDIR@
+CODEPAGEDIR=@CODEPAGEDIR@
+PAMMODULESDIR=@PAMMODULESDIR@
+CONFIGDIR=@CONFIGDIR@
+PRIVATE_DIR=@PRIVATE_DIR@
+LOCKDIR=@LOCKDIR@
+PIDDIR=@PIDDIR@
+STATEDIR=@STATEDIR@
+CACHEDIR=@CACHEDIR@
+LOGFILEBASE=@LOGFILEBASE@
+SOCKET_DIR=@SOCKET_DIR@
+PRIVILEGED_SOCKET_DIR=@PRIVILEGED_SOCKET_DIR@
+#WINBINDD_SOCKET_DIR=@WINBINDD_SOCKET_DIR@
+#WINBINDD_PRIVILEGED_SOCKET_DIR=@WINBINDD_PRIVILEGED_SOCKET_DIR@
+NMBDSOCKETDIR=@NMBDSOCKETDIR@
+#NTP_SIGND_SOCKET_DIR=@NTP_SIGND_SOCKET_DIR@
+NCALRPCDIR=@NCALRPCDIR@
+CONFIGFILE=@CONFIGFILE@
+LMHOSTSFILE=@LMHOSTSFILE@
+SMB_PASSWD_FILE=@SMB_PASSWD_FILE@
+
selftest_prefix=@selftest_prefix@
selftest_shrdir=@selftest_shrdir@
smbtorture4_path=@smbtorture4_path@
@@ -117,14 +153,6 @@ DESTDIR=/
# See the autoconf manual "Installation Directory Variables" for a
# discussion of the subtle use of these variables.
-BASEDIR= @prefix@
-BINDIR = @bindir@
-# sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
-SBINDIR = @sbindir@
-LIBDIR = @libdir@
-MODULESDIR = @modulesdir@
-INCLUDEDIR=@includedir@
-PAMMODULESDIR = @pammodulesdir@
VFSLIBDIR = $(MODULESDIR)/vfs
PERFCOUNTLIBDIR = $(MODULESDIR)/perfcount
PDBLIBDIR = $(MODULESDIR)/pdb
@@ -135,52 +163,12 @@ CHARSETLIBDIR = $(MODULESDIR)/charset
AUTHLIBDIR = $(MODULESDIR)/auth
CONFIGLIBDIR = $(MODULESDIR)/config
GPEXTLIBDIR = $(MODULESDIR)/gpext
-CONFIGDIR = @configdir@
VARDIR = @localstatedir@
-MANDIR = @mandir@
-DATADIR = @datadir@
-SETUPDIR = @datadir@/setup
# The permissions to give the executables and other data
INSTALLPERMS_BIN = 0755
INSTALLPERMS_DATA = 0644
-# set these to where to find various files
-# These can be overridden by command line switches (see smbd(8))
-# or in smb.conf (see smb.conf(5))
-LOGFILEBASE = @logfilebase@
-CONFIGFILE = $(CONFIGDIR)/smb.conf
-LMHOSTSFILE = $(CONFIGDIR)/lmhosts
-NCALRPCDIR = @ncalrpcdir@
-
-# This is where smbpasswd et al go
-PRIVATEDIR = @privatedir@
-
-SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
-PRIVATE_DIR = $(PRIVATEDIR)
-
-# This is where SWAT images and help files go
-SWATDIR = @swatdir@
-
-# This is where locale(mo) files go
-LOCALEDIR= @localedir@
-
-# the directory where lock files go
-LOCKDIR = @lockdir@
-
-# FHS directories; equal to LOCKDIR if not using --with-fhs, but also settable
-CACHEDIR = @cachedir@
-STATEDIR = @statedir@
-
-# Where to look for (and install) codepage databases.
-CODEPAGEDIR = @codepagedir@
-
-# the directory where pid files go
-PIDDIR = @piddir@
-
-# the directory where nmbd listens on the unexpected socket
-NMBDSOCKETDIR = @nmbdsocketdir@
-
FLAGS = -I. \
-I$(srcdir) \
@FLAGS1@ \
@@ -3256,7 +3244,7 @@ install-everything:: install installmodules
installdirs::
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) \
$(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) \
- $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \
+ $(VARDIR) $(PRIVATE_DIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \
$(NMBDSOCKETDIR) \
$(CACHEDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR)
@@ -3323,23 +3311,45 @@ installmo:: all installdirs
showlayout::
@echo "Samba will be installed into:"
- @echo " prefix: $(prefix)"
- @echo " bindir: $(BINDIR)"
- @echo " sbindir: $(SBINDIR)"
- @echo " libdir: $(LIBDIR)"
- @echo " modulesdir: $(MODULESDIR)"
- @echo " vardir: $(VARDIR)"
- @echo " mandir: $(MANDIR)"
- @echo " privatedir: $(PRIVATE_DIR)"
- @echo " configdir: $(CONFIGDIR)"
- @echo " lockdir: $(LOCKDIR)"
- @echo " statedir: $(STATEDIR)"
- @echo " cachedir: $(CACHEDIR)"
- @echo " piddir: $(PIDDIR)"
- @echo " nmbdsocketdir: $(NMBSOCKETDIR)"
- @echo " swatdir: $(SWATDIR)"
- @echo " datadir: ${DATADIR}"
- @echo " codepagedir: $(CODEPAGEDIR)"
+ @echo " prefix: $(prefix)"
+ @echo " exec_prefix: $(exec_prefix)"
+ @echo " sysconfdir: $(sysconfdir)"
+ @echo " localstatedir: $(localstatedir)"
+ @echo " datarootdir: $(datarootdir)"
+ @echo " BINDIR: $(BINDIR)"
+ @echo " SBINDIR: $(SBINDIR)"
+ @echo " LIBDIR: $(LIBDIR)"
+# @echo " LIBEXECDIR: $(LIBEXECDIR)"
+ @echo " MANDIR: $(MANDIR)"
+ @echo " DATADIR: $(DATADIR)"
+ @echo " LOCALEDIR: $(LOCALEDIR)"
+# @echo " SCRIPTSBINDIR: $(SCRIPTSBINDIR)"
+# @echo " PYTHONDIR: $(PYTHONDIR)"
+# @echo " PYTHONARCHDIR: $(PYTHONARCHDIR)"
+ @echo " MODULESDIR: $(MODULESDIR)"
+ @echo " INCLUDEDIR: $(INCLUDEDIR)"
+ @echo " SETUPDIR: $(SETUPDIR)"
+# @echo " PKGCONFIGDIR: $(PKGCONFIGDIR)"
+ @echo " SWATDIR: $(SWATDIR)"
+ @echo " CODEPAGEDIR: $(CODEPAGEDIR)"
+ @echo " PAMMODULESDIR: $(PAMMODULESDIR)"
+ @echo " CONFIGDIR: $(CONFIGDIR)"
+ @echo " PRIVATE_DIR: $(PRIVATE_DIR)"
+ @echo " LOCKDIR: $(LOCKDIR)"
+ @echo " PIDDIR: $(PIDDIR)"
+ @echo " STATEDIR: $(STATEDIR)"
+ @echo " CACHEDIR: $(CACHEDIR)"
+ @echo " LOGFILEBASE: $(LOGFILEBASE)"
+ @echo " SOCKET_DIR: $(SOCKET_DIR)"
+ @echo " PRIVILEGED_SOCKET_DIR: $(PRIVILEGED_SOCKET_DIR)"
+# @echo " WINBINDD_SOCKET_DIR: $(WINBINDD_SOCKET_DIR)"
+# @echo " WINBINDD_PRIVILEGED_SOCKET_DIR: $(WINBINDD_PRIVILEGED_SOCKET_DIR)"
+ @echo " NMBDSOCKETDIR: $(NMBDSOCKETDIR)"
+# @echo " NTP_SIGND_SOCKET_DIR: $(NTP_SIGND_SOCKET_DIR)"
+ @echo " NCALRPCDIR: $(NCALRPCDIR)"
+ @echo " CONFIGFILE: $(CONFIGFILE)"
+ @echo " LMHOSTSFILE: $(LMHOSTSFILE)"
+ @echo " SMB_PASSWD_FILE: $(SMB_PASSWD_FILE)"
uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index 1d65846e70..be31782f2b 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -9,308 +9,7 @@ dnl
AC_LIBREPLACE_LOCATION_CHECKS
-#################################################
-# Directory handling stuff to support both the
-# legacy SAMBA directories and FHS compliant
-# ones...
-AC_PREFIX_DEFAULT(/usr/local/samba)
-
-lockdir="\${VARDIR}/locks"
-piddir="\${VARDIR}/locks"
-ncalrpcdir="\${VARDIR}/ncalrpc"
-nmbdsocketdir="\${VARDIR}/nmbd"
-test "${mandir}" || mandir="\${prefix}/man"
-logfilebase="\${VARDIR}"
-privatedir="\${prefix}/private"
-test "${libdir}" || libdir="\${prefix}/lib"
-modulesdir="${libdir}"
-pammodulesdir="${libdir}/security"
-configdir="${libdir}"
-swatdir="\${prefix}/swat"
-codepagedir="\${MODULESDIR}"
-statedir="\${LOCKDIR}"
-cachedir="\${LOCKDIR}"
-localedir="\${prefix}/share/locale"
-
-AC_ARG_WITH(fhs,
-[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
-[ case "$withval" in
- yes)
- lockdir="\${VARDIR}/lib/samba"
- piddir="\${VARDIR}/run"
- mandir="\${prefix}/share/man"
- logfilebase="\${VARDIR}/log/samba"
- privatedir="\${CONFIGDIR}/private"
- test "${libdir}" || libdir="\${prefix}/lib"
- modulesdir="${libdir}/samba"
- configdir="\${sysconfdir}/samba"
- swatdir="\${DATADIR}/samba/swat"
- codepagedir="\${MODULESDIR}"
- statedir="\${VARDIR}/lib/samba"
- cachedir="\${VARDIR}/lib/samba"
- ncalrpcdir="\${VARDIR}/ncalrpc"
- AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
- ;;
- esac])
-
-#################################################
-# set private directory location
-AC_ARG_WITH(privatedir,
-[AS_HELP_STRING([--with-privatedir=DIR], [Where to put smbpasswd ($ac_default_prefix/private)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-privatedir called without argument - will use default])
- ;;
- * )
- privatedir="$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)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-lockdir called without argument - will use default])
- ;;
- * )
- lockdir="$withval"
- ;;
- esac])
-
-#################################################
-# set state directory location
-AC_ARG_WITH(statedir,
-[AS_HELP_STRING([--with-statedir=DIR], [Where to put persistent state files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-statedir called without argument - will use default])
- ;;
- * )
- statedir="$withval"
- ;;
- esac])
-
-#################################################
-# set cache directory location
-AC_ARG_WITH(cachedir,
-[AS_HELP_STRING([--with-cachedir=DIR], [Where to put temporary cache files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-cachedir called without argument - will use default])
- ;;
- * )
- cachedir="$withval"
- ;;
- esac])
-
-#################################################
-# set pid directory location
-AC_ARG_WITH(piddir,
-[AS_HELP_STRING([--with-piddir=DIR], [Where to put pid files ($ac_default_prefix/var/locks)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-piddir called without argument - will use default])
- ;;
- * )
- piddir="$withval"
- ;;
- esac])
-
-#################################################
-# set ncalrpc directory location
-AC_ARG_WITH(ncalrpcdir,
-[AS_HELP_STRING([--with-ncalrpcdir=DIR], [Where to put ncalrpc sockets ($ac_default_prefix/var/ncalrpc)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-ncalrpcdir called without argument - will use default])
- ;;
- * )
- ncalrpcdir="$withval"
- ;;
- esac])
-
-#################################################
-# set nmbd socket directory location
-AC_ARG_WITH(nmbdsocketdir,
-[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory ($ac_default_prefix/var/nmbd)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-nmbdsocketdir called without argument - will use default])
- ;;
- * )
- nmbdsocketdir="$withval"
- ;;
- esac])
-
-#################################################
-# set SWAT directory location
-AC_ARG_WITH(swatdir,
-[AS_HELP_STRING([--with-swatdir=DIR], [Where to put SWAT files ($ac_default_prefix/swat)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-swatdir called without argument - will use default])
- ;;
- * )
- swatdir="$withval"
- ;;
- esac])
-
-#################################################
-# set configuration directory location
-AC_ARG_WITH(configdir,
-[AS_HELP_STRING([--with-configdir=DIR], [Where to put configuration files ($libdir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-configdir called without argument - will use default])
- ;;
- * )
- configdir="$withval"
- ;;
- esac])
-
-#################################################
-# set log directory location
-AC_ARG_WITH(logfilebase,
-[AS_HELP_STRING([--with-logfilebase=DIR], [Where to put log files ($VARDIR)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-logfilebase called without argument - will use default])
- ;;
- * )
- logfilebase="$withval"
- ;;
- esac])
-
-
-#################################################
-# set shared modules (internal lib) directory location
-AC_ARG_WITH(modulesdir,
-[AS_HELP_STRING([--with-modulesdir=DIR], [Where to put shared modules ($libdir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-modulesdir without argument - will use default])
- ;;
- * )
- modulesdir="$withval"
- ;;
- esac])
-
-#################################################
-# set PAM modules directory location
-AC_ARG_WITH(pammodulesdir,
-[AS_HELP_STRING([--with-pammodulesdir=DIR], [Which directory to use for PAM modules ($ac_default_prefix/$libdir/security)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-pammodulesdir called without argument - will use default])
- ;;
- * )
- pammodulesdir="$withval"
- ;;
- esac])
-
-#################################################
-# set man directory location
-AC_ARG_WITH(mandir,
-[AS_HELP_STRING([--with-mandir=DIR], [Where to put man pages ($mandir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-mandir without argument - will use default])
- ;;
- * )
- mandir="$withval"
- ;;
- esac])
-
-################################################
-# set locale directory location
-AC_ARG_WITH(localedir,
-[AS_HELP_STRING([--with-localedir=DIR],[Where to put po files ($ac_default_prefix/share/locale)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
- AC_MSG_WARN([--with-localedir called without argument - will use default])
- ;;
- *)
- localedir="$withval"
- ;;
- esac])
-
-#################################################
-# set codepage directory location
-AC_ARG_WITH(codepagedir,
-[AS_HELP_STRING([--with-codepagedir=DIR], [Where to put codepages ($ac_default_prefix/lib/samba)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody calls it without argument
- #
- AC_MSG_WARN([--with-codepagedir called without argument - will use default])
- ;;
- * )
- codepagedir="$withval"
- ;;
- esac])
-
-
-AC_SUBST(configdir)
-AC_SUBST(lockdir)
-AC_SUBST(piddir)
-AC_SUBST(nmbdsocketdir)
-AC_SUBST(ncalrpcdir)
-AC_SUBST(logfilebase)
-AC_SUBST(privatedir)
-AC_SUBST(swatdir)
-AC_SUBST(bindir)
-AC_SUBST(sbindir)
-AC_SUBST(codepagedir)
-AC_SUBST(statedir)
-AC_SUBST(cachedir)
-AC_SUBST(pammodulesdir)
-AC_SUBST(modulesdir)
-AC_SUBST(localedir)
+m4_include(../dynconfig/config.m4)
#################################################
# set prefix for 'make test'