Switch the use of LOCKDIR in acconfig.h to --enable-lockdir.

diff --git a/acconfig.h b/acconfig.h
index 3649bf33419ac15fd1bead9f25b8d396b60d076c..70c2c6dc69dc069059110e9287eef83a7c835d1d 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -11,15 +11,6 @@
  * wish to change the features that are compiled into nmh.
  */
 
-/*
- * If you have defined DOT_LOCKING, then the default is to
- * place the lock files in the same directory as the file that
- * is to be locked.  Alternately, if you define LOCKDIR, you
- * can specify that all lock files go in a specific directory.
- * Don't define this unless you know you need it.
- */
-/* #define LOCKDIR "/usr/spool/locks" */
-
 /*
  * Define this if your passwords are stored in some type of
  * distributed name service, such as NIS, or NIS+.

diff --git a/configure.in b/configure.in
index 55e139331393bac1d4e5151b60663660f98af367..64fcd4fda3d08820f6093e7f033901c50df91d8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -153,6 +153,17 @@ else
   AC_DEFINE(DOT_LOCKING)dnl
 fi
 
+dnl Should we use a locking directory?
+AC_ARG_ENABLE([lockdir], [
+  AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [
+  AS_IF([test "x$enableval" = xyes],[
+    AC_MSG_ERROR([--enable-lockdir requires an argument])])
+  AS_IF([test "x$LOCKTYPE" != xdot],[
+    AC_MSG_ERROR([Can only use --enable-lockdir with dot locking])])
+  AC_DEFINE_UNQUOTED([LOCKDIR], ["$enableval"],
+                    [Directory to store dot-locking lock files])
+])
+
 dnl What method of posting should post use?
 AC_ARG_WITH(mts,
   AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 7c27535c353a6a4c20d32d8ecbce191da84ade46..14ad5795a0d1f581b7cc5accfaeee4e41012c447 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -7,3 +7,4 @@ Things to add to the release notes for the next full release:
   garbage collected.
 - Old code enabled by the UCI preprocessor definition has been
   garbage-collected.
+- LOCKDIR is now configurable via --enable-lockdir

diff --git a/man/mh-tailor.man b/man/mh-tailor.man
index 15704eeec126e7692ece9cb4df6ff24d5ff13278..4a30db1d0cbe99b3ac1ca975f35d9cd1a4897ec8 100644 (file)
--- a/man/mh-tailor.man
+++ b/man/mh-tailor.man
@@ -387,12 +387,11 @@ specifies that
 a file should be created whose existence means \*(lqlocked\*(rq and
 whose non-existence means \*(lqunlocked\*(rq.  The name of this file is
 constructed by appending \*(lq.lock\*(rq to the name of the file being
-locked.  If
-.B LOCKDIR
-is not specified, lock files will be created
+locked.  If \*(lq--enable-lockdir=directory\*(rq
+is not specified at build time, lock files will be created
 in the directory where the file being locked resides.  Otherwise, lock
 files will be created in the directory specified by
-.BR LOCKDIR .
+\*(lq--enable-lockdir\*(rq.
 .PP
 Prior to installing
 .BR nmh ,