Remove LOCKDIR support
Этот коммит содержится в:
родитель
5959aff123
Коммит
7197808ece
@ -47,9 +47,6 @@ PRIVATEDIR = @privatedir@
|
|||||||
|
|
||||||
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
|
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
|
||||||
|
|
||||||
# the directory where lock files go
|
|
||||||
LOCKDIR = @lockdir@
|
|
||||||
|
|
||||||
# The directory where code page definition files go
|
# The directory where code page definition files go
|
||||||
CODEPAGEDIR = @codepagedir@
|
CODEPAGEDIR = @codepagedir@
|
||||||
|
|
||||||
@ -59,7 +56,7 @@ CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936
|
|||||||
PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
|
PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
|
||||||
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
|
FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
|
||||||
FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
|
FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
|
||||||
FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
|
FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
|
||||||
FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
|
FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
|
||||||
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
|
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
|
||||||
FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
|
FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
|
||||||
|
@ -581,27 +581,6 @@ AC_ARG_WITH(privatedir,
|
|||||||
AC_SUBST(privatedir)]
|
AC_SUBST(privatedir)]
|
||||||
)
|
)
|
||||||
|
|
||||||
#################################################
|
|
||||||
# set lock directory location
|
|
||||||
AC_ARG_WITH(lockdir,
|
|
||||||
[ --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='$(VARDIR)/locks'
|
|
||||||
;;
|
|
||||||
* )
|
|
||||||
lockdir="$withval"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
AC_SUBST(lockdir)],
|
|
||||||
[lockdir='$(VARDIR)/locks'
|
|
||||||
AC_SUBST(lockdir)]
|
|
||||||
)
|
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
# set configuration directory location
|
# set configuration directory location
|
||||||
configdir="\$(LIBDIR)"
|
configdir="\$(LIBDIR)"
|
||||||
|
@ -71,11 +71,6 @@
|
|||||||
/* separators for lists */
|
/* separators for lists */
|
||||||
#define LIST_SEP " \t,;:\n\r"
|
#define LIST_SEP " \t,;:\n\r"
|
||||||
|
|
||||||
#ifndef LOCKDIR
|
|
||||||
/* this should have been set in the Makefile */
|
|
||||||
#define LOCKDIR "/tmp/samba"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* this is where browse lists are kept in the lock dir */
|
/* this is where browse lists are kept in the lock dir */
|
||||||
#define SERVER_LIST "browse.dat"
|
#define SERVER_LIST "browse.dat"
|
||||||
|
|
||||||
|
@ -850,7 +850,6 @@ static void init_globals(void)
|
|||||||
string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
|
string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
|
||||||
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
|
string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
|
||||||
string_set(&Globals.szDriverFile, DRIVERFILE);
|
string_set(&Globals.szDriverFile, DRIVERFILE);
|
||||||
string_set(&Globals.szLockDir, LOCKDIR);
|
|
||||||
string_set(&Globals.szRootdir, "/");
|
string_set(&Globals.szRootdir, "/");
|
||||||
string_set(&Globals.szSocketAddress, "0.0.0.0");
|
string_set(&Globals.szSocketAddress, "0.0.0.0");
|
||||||
string_set(&Globals.szServerString, "Samba " VERSION);
|
string_set(&Globals.szServerString, "Samba " VERSION);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user