[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 74d27af89981fc92ea56dec5474a1cec7ac5e474

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  74d27af89981fc92ea56dec5474a1cec7ac5e474 (commit)
       via  b227669eb3338ad951c81e7efea1c76026b9f661 (commit)
      from  ee7927a7998bde4f7ff8303b88b101cd9da1dfc3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=74d27af89981fc92ea56dec5474a1cec7ac5e474


commit 74d27af89981fc92ea56dec5474a1cec7ac5e474
Author: Ken Hornstein <address@hidden>
Date:   Thu Jan 5 22:13:08 2012 -0500

    Not sure why we're checking for st_blksize; it's required by POSIX and
    we're not even using the define!

diff --git a/configure.in b/configure.in
index 64fcd4f..4657b50 100644
--- a/configure.in
+++ b/configure.in
@@ -779,7 +779,6 @@ fi
 dnl ----------------
 dnl CHECK STRUCTURES
 dnl ----------------
-AC_CHECK_MEMBERS(struct stat.st_blksize)
 
 AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,,
   [#ifdef TIME_WITH_SYS_TIME

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=b227669eb3338ad951c81e7efea1c76026b9f661


commit b227669eb3338ad951c81e7efea1c76026b9f661
Author: Ken Hornstein <address@hidden>
Date:   Thu Jan 5 22:08:23 2012 -0500

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

diff --git a/acconfig.h b/acconfig.h
index 3649bf3..70c2c6d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -12,15 +12,6 @@
  */
 
 /*
- * 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 55e1393..64fcd4f 100644
--- 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 7c27535..14ad579 100644
--- 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 15704ee..4a30db1 100644
--- 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 ,

-----------------------------------------------------------------------

Summary of changes:
 acconfig.h                 |    9 ---------
 configure.in               |   12 +++++++++++-
 docs/pending-release-notes |    1 +
 man/mh-tailor.man          |    7 +++----
 4 files changed, 15 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System