[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Jul 13 09:45:03 MDT 2011
The branch, master has been updated
via 8612c6b dynconfig/wscript: use $libdir/security for PAMMODULESDIR as in config.m4
via 46109a9 s3:configure: use the same dynconfig options and default values as the toplevel build
from 9b3357c Fix bug 8305 - nmbd segfaults - when using "smbtree ..."
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8612c6bf56ebfcbf6273d8e7305ee382fa4f807e
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jul 13 13:06:16 2011 +0200
dynconfig/wscript: use $libdir/security for PAMMODULESDIR as in config.m4
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Jul 13 17:44:01 CEST 2011 on sn-devel-104
commit 46109a9f8a04115d709fa004fcadc5a6259c4bfa
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jul 13 11:26:12 2011 +0200
s3:configure: use the same dynconfig options and default values as the toplevel build
metze
-----------------------------------------------------------------------
Summary of changes:
dynconfig/config.m4 | 256 ++++++++++++++++++++++++++++++++++++++
dynconfig/wscript | 6 +-
source3/Makefile.in | 142 ++++++++++++----------
source3/m4/check_path.m4 | 303 +---------------------------------------------
4 files changed, 336 insertions(+), 371 deletions(-)
create mode 100644 dynconfig/config.m4
Changeset truncated at 500 lines:
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
new file mode 100644
index 0000000..4e95991
--- /dev/null
+++ b/dynconfig/config.m4
@@ -0,0 +1,256 @@
+#################################################
+# Directory handling stuff to support both the
+# legacy SAMBA directories and FHS compliant
+# ones...
+AC_PREFIX_DEFAULT(/usr/local/samba)
+
+test x"${modulesdir}" = x"" && {
+ modulesdir="\${exec_prefix}/modules"
+}
+
+BINDIR="${bindir}"
+SBINDIR="${sbindir}"
+LIBDIR="${libdir}"
+LIBEXECDIR="${libexecdir}"
+MANDIR="${mandir}"
+DATADIR="${datadir}"
+LOCALEDIR="${localedir}"
+SCRIPTSBINDIR="${sbindir}"
+#PYTHONDIR
+#PYTHONARCHDIR
+
+AC_ARG_ENABLE(fhs,
+[AS_HELP_STRING([--enable-fhs], [Turn on FHS support (default=no)])])
+
+if test x$enable_fhs != xyes; then
+ MODULESDIR="${modulesdir}"
+ INCLUDEDIR="${includedir}"
+ SETUPDIR="${datadir}/setup"
+ PKGCONFIGDIR="${libdir}/pkgconfig"
+ SWATDIR="${datadir}/swat"
+ CODEPAGEDIR="${datadir}/codepages"
+ PAMMODULESDIR="${libdir}/security"
+ CONFIGDIR="${sysconfdir}"
+ PRIVATE_DIR="${prefix}/private"
+ LOCKDIR="${localstatedir}/lock"
+ PIDDIR="${localstatedir}/run"
+ STATEDIR="${localstatedir}/locks"
+ CACHEDIR="${localstatedir}/cache"
+ LOGFILEBASE="${localstatedir}"
+ SOCKET_DIR="${localstatedir}/run"
+ PRIVILEGED_SOCKET_DIR="${localstatedir}/lib"
+else
+ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
+
+ MODULESDIR="${modulesdir}/samba"
+ INCLUDEDIR="${includedir}/samba-4.0"
+ SETUPDIR="${datadir}/samba/setup"
+ PKGCONFIGDIR="${libdir}/pkgconfig"
+ SWATDIR="${datadir}/samba/swat"
+ CODEPAGEDIR="${datadir}/samba/codepages"
+ PAMMODULESDIR="${libdir}/security"
+ CONFIGDIR="${sysconfdir}/samba"
+ PRIVATE_DIR="${localstatedir}/lib/samba/private"
+ LOCKDIR="${localstatedir}/lock/samba"
+ PIDDIR="${localstatedir}/run/samba"
+ STATEDIR="${localstatedir}/lib/samba"
+ CACHEDIR="${localstatedir}/cache/samba"
+ LOGFILEBASE="${localstatedir}/log/samba"
+ SOCKET_DIR="${localstatedir}/run/samba"
+ PRIVILEGED_SOCKET_DIR="${localstatedir}/lib/samba"
+fi
+
+AC_ARG_WITH(pammodulesdir,
+[AS_HELP_STRING([--with-pammodulesdir=DIR],
+ [Which directory to use for PAM modules ($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])
+
+AC_ARG_WITH(configdir,
+[AS_HELP_STRING([--with-configdir=DIR],
+ [Where to put configuration files ($sysconfdir)])],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-configdir called without argument - will use default])
+ ;;
+ * )
+ CONFIGDIR="$withval"
+ ;;
+ esac])
+
+AC_ARG_WITH(privatedir,
+[AS_HELP_STRING([--with-privatedir=DIR],
+ [Where to put passdb.tdb and other private files ($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])
+ ;;
+ * )
+ PRIVATE_DIR="$withval"
+ ;;
+ esac])
+
+AC_ARG_WITH(lockdir,
+[AS_HELP_STRING([--with-lockdir=DIR],
+ [Where to put short term disposable state files ($localstatedir/lock)])],
+[ 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])
+
+AC_ARG_WITH(piddir,
+[AS_HELP_STRING([--with-piddir=DIR],
+ [Where to put pid files ($localstatedir/run)])],
+[ 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])
+
+AC_ARG_WITH(statedir,
+[AS_HELP_STRING([--with-statedir=DIR],
+ [Where to put persistent state files ($localstatedir/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])
+
+AC_ARG_WITH(cachedir,
+[AS_HELP_STRING([--with-cachedir=DIR],
+ [Where to put temporary cache files ($localstatedir/cache)])],
+[ 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])
+
+AC_ARG_WITH(logfilebase,
+[AS_HELP_STRING([--with-logfilebase=DIR],
+ [Where to put log files ($localstatedir)])],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-logfilebase called without argument - will use default])
+ ;;
+ * )
+ LOGFILEBASE="$withval"
+ ;;
+ esac])
+
+AC_ARG_WITH(sockets-dir,
+[AS_HELP_STRING([--with-sockets-dir=DIR],
+ [socket directory ($localstatedir/run)])],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-sockets-dir called without argument - will use default])
+ ;;
+ * )
+ SOCKET_DIR="$withval"
+ ;;
+ esac])
+
+AC_ARG_WITH(privileged-socket-dir,
+[AS_HELP_STRING([--with-privileged-socket-dir=DIR],
+ [privileged socket directory ($localstatedir/lib)])],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-sockets-dir called without argument - will use default])
+ ;;
+ * )
+ PRIVILEGED_SOCKET_DIR="$withval"
+ ;;
+ esac])
+
+WINBINDD_SOCKET_DIR="${SOCKET_DIR}/winbindd"
+WINBINDD_PRIVILEGED_SOCKET_DIR="${PRIVILEGED_SOCKET_DIR}/winbindd_privileged"
+NMBDSOCKETDIR="${SOCKET_DIR}/nmbd"
+NTP_SIGND_SOCKET_DIR="${SOCKET_DIR}/ntp_signd"
+NCALRPCDIR="${SOCKET_DIR}/ncalrpc"
+CONFIGFILE="${CONFIGDIR}/smb.conf"
+LMHOSTSFILE="${CONFIGDIR}/lmhosts"
+SMB_PASSWD_FILE="${PRIVATE_DIR}/smbpasswd"
+
+AC_SUBST(BINDIR)
+AC_SUBST(SBINDIR)
+AC_SUBST(LIBDIR)
+AC_SUBST(LIBEXECDIR)
+AC_SUBST(MANDIR)
+AC_SUBST(DATADIR)
+AC_SUBST(LOCALEDIR)
+AC_SUBST(SCRIPTSBINDIR)
+dnl AC_SUBST(PYTHONDIR)
+dnl AC_SUBST(PYTHONARCHDIR)
+AC_SUBST(MODULESDIR)
+AC_SUBST(INCLUDEDIR)
+AC_SUBST(SETUPDIR)
+AC_SUBST(PKGCONFIGDIR)
+AC_SUBST(SWATDIR)
+AC_SUBST(CODEPAGEDIR)
+AC_SUBST(PAMMODULESDIR)
+AC_SUBST(CONFIGDIR)
+AC_SUBST(PRIVATE_DIR)
+AC_SUBST(LOCKDIR)
+AC_SUBST(PIDDIR)
+AC_SUBST(STATEDIR)
+AC_SUBST(CACHEDIR)
+AC_SUBST(LOGFILEBASE)
+AC_SUBST(SOCKET_DIR)
+AC_SUBST(PRIVILEGED_SOCKET_DIR)
+AC_SUBST(WINBINDD_SOCKET_DIR)
+AC_SUBST(WINBINDD_PRIVILEGED_SOCKET_DIR)
+AC_SUBST(NMBDSOCKETDIR)
+AC_SUBST(NTP_SIGND_SOCKET_DIR)
+AC_SUBST(NCALRPCDIR)
+AC_SUBST(CONFIGFILE)
+AC_SUBST(LMHOSTSFILE)
+AC_SUBST(SMB_PASSWD_FILE)
+
diff --git a/dynconfig/wscript b/dynconfig/wscript
index f0a468e..e9815e0 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -142,8 +142,8 @@ dynconfig = {
'FHS-PATH': '${DATADIR}/samba/codepages',
},
'PAMMODULESDIR' : {
- 'STD-PATH': '${LIBDIR}',
- 'FHS-PATH': '${LIBDIR}',
+ 'STD-PATH': '${LIBDIR}/security',
+ 'FHS-PATH': '${LIBDIR}/security',
'OPTION': '--with-pammodulesdir',
'HELPTEXT': 'Which directory to use for PAM modules',
},
@@ -173,7 +173,7 @@ dynconfig = {
},
'STATEDIR' : {
'STD-PATH': '${LOCALSTATEDIR}/locks',
- 'FHS-PATH': '${LOCALSTATEDIR}/lib/samba/',
+ 'FHS-PATH': '${LOCALSTATEDIR}/lib/samba',
'OPTION': '--with-statedir',
'HELPTEXT': 'Where to put persistent state files',
},
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 146c9cb..0a72cf5 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 1d65846..be31782 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}"
--
Samba Shared Repository
More information about the samba-cvs
mailing list