From 6f553ae8e134266be6cf3704449ec4116461c8e0 Mon Sep 17 00:00:00 2001
From: Fabrice Bauzac <noon@mykolab.com>
Date: Sun, 20 Mar 2022 08:31:32 +0100
Subject: [PATCH] Review Autoconf files

Fix Autoconf warnings.
Use AS_HELP_STRING to align configure options properly.
Gitignore autom4te.cache.
---
 .gitignore   |  1 +
 acconfig.h   | 13 -------------
 configure.ac | 10 ++++++----
 3 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 acconfig.h

diff --git a/.gitignore b/.gitignore
index b36c6f9..a8f0eed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ config.log
 config.status
 dotlockfile
 maillock.h
+/autom4te.cache/
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index b27bf11..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-
-acconfig.h - template used by autoheader to create config.h.in
-config.h.in - used by autoconf to create config.h
-config.h - created by autoconf; contains defines generated by autoconf
-
-*/
-
-@TOP@
-
-/* Is the mailspool group writable */
-#undef MAILGROUP
-
diff --git a/configure.ac b/configure.ac
index df26cee..86745bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,8 @@ dnl extra argument: --with-libnfslock
 nfslockdir="$libdir"
 AC_MSG_CHECKING(build libnfslock)
 AC_ARG_WITH(libnfslock,
-[  --with-libnfslock[=DIR] Build libnfslock (and install in DIR)],
+[AS_HELP_STRING([--with-libnfslock[=DIR]],
+               [Build libnfslock (and install in DIR)])],
 [ case "$withval" in
     no)
 	LIBNFSLOCK=no
@@ -54,9 +55,10 @@ AC_ARG_WITH(libnfslock,
 AC_SUBST(LIBNFSLOCK)
 AC_MSG_RESULT($LIBNFSLOCK)
 
-dnl extra argument: --with-mailgroup[=mail]
+dnl extra argument: --with-mailgroup[=group]
 AC_ARG_WITH(mailgroup,
-[  --with-mailgroup[=group] Run setgid (mail) to write to the mailspool],
+[AS_HELP_STRING([--with-mailgroup[=GROUP]],
+                [Run setgid (group "mail" by default) to write to the mailspool directory])],
 [ case "$withval" in
     yes)
 	MAILGROUP="mail"
@@ -67,7 +69,7 @@ AC_ARG_WITH(mailgroup,
   esac ]
 )
 if test "$MAILGROUP" != ""; then
-    AC_DEFINE_UNQUOTED(MAILGROUP, "$MAILGROUP")
+    AC_DEFINE_UNQUOTED([MAILGROUP], ["$MAILGROUP"], [If the mailspool is group-writable, defined as that group; undefined otherwise.])
 fi
 AC_SUBST(MAILGROUP)