Commit 43e70921 authored by salaun's avatar salaun
Browse files

[BugID 257] FIx: Add --with-lockdir to configure


git-svn-id: https://subversion.renater.fr/sympa/trunk@2180 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent bf4a4dce
......@@ -98,7 +98,7 @@ ICONSDIR = @ICONSDIR@
## Settings used in src/etc/scripts/sympa
PIDPRE = pidof -x
PIDPOST =
LOCKDIR = /var/lock/subsys
LOCKDIR = @LOCKDIR@
## Path to newaliases command (or what else may be called to rebuild
## Mail aliases database)
......
......@@ -118,6 +118,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBDIR = @LIBDIR@
LIBEXECDIR = @LIBEXECDIR@
LOCKDIR = @LOCKDIR@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
......@@ -186,7 +187,6 @@ WWSBINDIR = $(BINDIR)
PIDPRE = pidof -x
PIDPOST =
LOCKDIR = /var/lock/subsys
SSLCERTDIR = $(EXPL_DIR)/X509-user-certs
CFLAGS = -g
......
......@@ -272,7 +272,7 @@ PACKAGE_BUGREPORT=
ac_unique_file="check_perl_modules.pl"
ac_default_prefix=/home/sympa
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAJOR_VERSION MINOR_VERSION MICRO_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONFDIR CGIDIR ICONSDIR BINDIR SBINDIR LIBEXECDIR LIBDIR DATADIR EXPLDIR MANDIR INITDIR PIDDIR ETCDIR NLSDIR DOCDIR SCRIPTDIR SAMPLEDIR SPOOLDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP PERL SUIDPERL MHONARC OPENSSL CVS2CL SH USER GROUP SENDMAIL_ALIASES VIRTUAL_ALIASES NEWALIASES NEWALIASES_ARG POSTMAP POSTMAP_ARG MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAJOR_VERSION MINOR_VERSION MICRO_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONFDIR CGIDIR ICONSDIR BINDIR SBINDIR LIBEXECDIR LIBDIR DATADIR EXPLDIR MANDIR INITDIR LOCKDIR PIDDIR ETCDIR NLSDIR DOCDIR SCRIPTDIR SAMPLEDIR SPOOLDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP PERL SUIDPERL MHONARC OPENSSL CVS2CL SH USER GROUP SENDMAIL_ALIASES VIRTUAL_ALIASES NEWALIASES NEWALIASES_ARG POSTMAP POSTMAP_ARG MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
......@@ -832,6 +832,7 @@ Optional Packages:
--with-expldir=DIR modifiable data files in DIR (default ${prefix}/expl)
--with-mandir=DIR documentation in DIR (default /usr/local/man)
--with-initdir=DIR install System V init script in DIR (default /etc/rc.d/init.d)
--with-lockdir=DIR create lock files in DIR (default /var/lock/subsys)
--with-piddir=DIR create .pid files in DIR (default ${prefix})
--with-etcdir=DIR Config directories populated by the user are in DIR (default ${prefix}/etc)
--with-nlsdir=DIR create language files in DIR (default ${prefix}/nls)
......@@ -1845,6 +1846,16 @@ if test "${with_initdir+set}" = set; then
fi;
## Lock directory
LOCKDIR=/var/lock/subsys
# Check whether --with-initdir or --without-initdir was given.
if test "${with_initdir+set}" = set; then
withval="$with_initdir"
LOCKDIR="$withval"
fi;
## directory for storing .pid files
PIDDIR='${prefix}'
......@@ -4307,6 +4318,7 @@ s,@DATADIR@,$DATADIR,;t t
s,@EXPLDIR@,$EXPLDIR,;t t
s,@MANDIR@,$MANDIR,;t t
s,@INITDIR@,$INITDIR,;t t
s,@LOCKDIR@,$LOCKDIR,;t t
s,@PIDDIR@,$PIDDIR,;t t
s,@ETCDIR@,$ETCDIR,;t t
s,@NLSDIR@,$NLSDIR,;t t
......
......@@ -93,6 +93,11 @@ INITDIR=/etc/rc.d/init.d
AC_ARG_WITH(initdir, [ --with-initdir=DIR install System V init script in DIR (default /etc/rc.d/init.d)], [INITDIR="$withval"])
AC_SUBST(INITDIR)
## Lock directory
LOCKDIR=/var/lock/subsys
AC_ARG_WITH(initdir, [ --with-lockdir=DIR create lock files in DIR (default /var/lock/subsys)], [LOCKDIR="$withval"])
AC_SUBST(LOCKDIR)
## directory for storing .pid files
PIDDIR='${prefix}'
AC_ARG_WITH(piddir, [ --with-piddir=DIR create .pid files in DIR (default ${prefix})], [PIDDIR="$withval"])
......
......@@ -1017,6 +1017,8 @@ this should point to \dir {/etc/smrsh}. This is probably the case if you are us
\item \option {--with-initdir=DIR}, install System V init script in DIR (default /etc/rc.d/init.d)
\item \option {--with-lockdir=DIR}, create lock files in DIR (default /var/lock/subsys)
\item \option {--with-piddir=DIR}, create .pid files in DIR (default /home/sympa/)
\item \option {--with-etcdir=DIR}, Config directories populated by the user are in DIR (default /home/sympa/etc)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment