Fix build with mailutils 3.4

* Makefile.am (ACLOCAL_AMFLAGS): Add am.
* NEWS: Update.
* am/mailutils.m4: New file. A fixed version of upstream mailutils.m4
* configure.ac: Require mailutils 3.3. Raise patchlevel.

* tests/nullmail.c: New file.
* tests/.gitignore: Add nullmail
* tests/Makefile.am: Build nullmail

* tests/etc/nullmail: Remove
* tests/etc/Makefile.am: Remove nullmail script.

* tests/atlocal.in (WY_TESTDIR): New variable.
* tests/check-notify.at: Use new nullmail tool. Update expected
output.
* tests/mailstats.at: Likewise.
* tests/notify-upl.at: Likewise.
* tests/etc/mailstats.rcin: Fix mailer command line.
* tests/etc/notify.rcin: Likewise.

15 files changed, 192 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index 831bc79..897c567 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with wydawca.  If not, see <http://www.gnu.org/licenses/>.
 
-ACLOCAL_AMFLAGS = -I m4 -I grecs/am -I imprimatur
+ACLOCAL_AMFLAGS = -I m4 -I am -I grecs/am -I imprimatur
 
 SUBDIRS=grecs libltdl include src modules imprimatur doc etc tests
 
diff --git a/NEWS b/NEWS
index c841c35..789a0ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-Wydawca NEWS -- history of user-visible changes. 2013-03-12
+Wydawca NEWS -- history of user-visible changes. 2017-11-11
 Copyright (C) 2007-2013, 2017 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send Wydawca bug reports to <bug-wydawca@gnu.org.ua>.
 
 
-Version 2.99.90
+Version 2.99.91 (git)
 
 Version 2.2 "HGY", 2013-01-01
 
diff --git a/am/mailutils.m4 b/am/mailutils.m4
new file mode 100644
index 0000000..9bb79a0
--- /dev/null
+++ b/am/mailutils.m4
@@ -0,0 +1,89 @@
+dnl A fixed version of AM_MAILUTILS macro.
+dnl The macro shipped with mailutils 3.3 mishandles the "mailer"
+dnl link requirement. Until it is fixed upstream, wydawca will be
+dnl using this version.
+
+dnl Copyright (C) 2006-2007, 2010-2012, 2014-2017 Free Software
+dnl Foundation, Inc.
+dnl
+dnl GNU Mailutils is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 3, or (at
+dnl your option) any later version.
+dnl
+dnl GNU Mailutils is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+m4_define([am_mu_vercmp],[
+m4_pushdef([_ver_A_],m4_car($1))dnl
+m4_pushdef([_ver_B_],m4_car($2))dnl
+m4_if(_ver_B_,,:,[if test m4_if(_ver_A_,,0,_ver_A_) -lt _ver_B_; then
+  $3  
+elif test m4_if(_ver_A_,,0,_ver_A_) -eq _ver_B_; then  
+am_mu_vercmp(m4_cdr($1),m4_cdr($2),[$3])
+fi
+m4_popdef([_ver_A_])dnl
+m4_popdef([_ver_B_])dnl])])
+
+dnl AM_GNU_MAILUTILS(minversion, link-req, [act-if-found], [ac-if-not-found])
+dnl                      $1         $2           $3              $4
+dnl Verify if GNU Mailutils is installed and if its version is `minversion'
+dnl or newer.  If not installed, execute `ac-if-not-found' or, if it is not
+dnl given, spit out an error message.
+dnl
+dnl If Mailutils is found, set:
+dnl     MAILUTILS_CONFIG to the full name of the mailutils-config program;
+dnl     MAILUTILS_VERSION to the Mailutils version (string);
+dnl     MAILUTILS_VERSION_MAJOR  Mailutils version: major number
+dnl     MAILUTILS_VERSION_MINOR  Mailutils version: minor number
+dnl     MAILUTILS_VERSION_PATCH  Mailutils version: patchlevel number (or 0,
+dnl                              if not defined)
+dnl     MAILUTILS_LIBS to the list of cc(1) flags needed to link in the
+dnl         libraries requested by `link-req';
+dnl     MAILUTILS_INCLUDES to the list of cc(1) flags needed to set include
+dnl         paths to the Mailutils headers.
+dnl
+dnl Finally, if `act-if-found' is given, execute it.  Otherwise, append the
+dnl value of $MAILUTILS_LIBS to LIBS. 
+dnl
+AC_DEFUN([AM_GNU_MAILUTILS],
+ [AC_PATH_PROG(MAILUTILS_CONFIG, mailutils-config, none, $PATH)
+  if test "$MAILUTILS_CONFIG" = "none"; then
+    m4_if($4,,[AC_MSG_ERROR(cannot find GNU Mailutils)], [$4])
+  fi
+  AC_SUBST(MAILUTILS_CONFIG)
+  AC_SUBST(MAILUTILS_VERSION)
+  AC_SUBST(MAILUTILS_INCLUDES)
+  AC_SUBST(MAILUTILS_LIBS)
+
+  m4_ifndef([MU_VERSION_PARSE_DEFINED],[[
+mu_version_parse() {
+    set -- `echo "@S|@1" | sed 's/^\([0-9\.][0-9\.]*\).*/\1/;s/\./ /g'`
+    major=@S|@{1:-0}
+    minor=@S|@{2:-0}
+    patch=@S|@{3:-0}
+}]
+  m4_pushdef([MU_VERSION_PARSE_DEFINED])])
+
+  MAILUTILS_VERSION=`$MAILUTILS_CONFIG --info version|sed 's/VERSION=//'`
+  mu_version_parse $MAILUTILS_VERSION
+  AC_DEFINE_UNQUOTED([MAILUTILS_VERSION_MAJOR], $major, [Mailutils version major number])
+  AC_DEFINE_UNQUOTED([MAILUTILS_VERSION_MINOR], $minor, [Mailutils version minor number])
+  AC_DEFINE_UNQUOTED([MAILUTILS_VERSION_PATCH], $patch, [Mailutils version patchlevel number])
+  
+  AC_DEFINE_UNQUOTED(MAILUTILS_VERSION, "$MAILUTILS_VERSION", [Mailutils version number]) 
+  m4_if($1,,,[
+   am_mu_vercmp(m4_quote($major, $minor, $patch),
+                m4_dquote(m4_bpatsubst($1, [\.],[,])),
+      [AC_MSG_ERROR([Mailutils v. $MAILUTILS_VERSION is too old; required is at least ]$1)])
+  ])
+  MAILUTILS_LIBS=`$MAILUTILS_CONFIG --link $2`
+  MAILUTILS_INCLUDES=`$MAILUTILS_CONFIG --compile`
+  m4_if($3,,[LIBS="$LIBS $MAILUTILS_LIBS"], [$3])
+])  
+  
diff --git a/configure.ac b/configure.ac
index 85dce1a..3e18a57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # along with wydawca.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
-AC_INIT([wydawca], 2.99.90, [bug-wydawca@gnu.org.ua], [wydawca],
+AC_INIT([wydawca], 2.99.91, [bug-wydawca@gnu.org.ua], [wydawca],
         [http://www.gnu.org.ua/software/wydawca])
 AC_CONFIG_SRCDIR([src/wydawca.c])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -68,7 +68,7 @@ AC_CHECK_FUNCS([fchdir memset strchr strdup strerror strrchr setegid setregid\
 # Mailutils
 # **********************        
 
-AM_GNU_MAILUTILS(2.0, [mailer], [status_mailutils=yes], [status_mailutils=no])
+AM_GNU_MAILUTILS(3.3, [mailer], [status_mailutils=yes], [status_mailutils=no])
 AM_CONDITIONAL([COND_MAILUTILS],[test $status_mailutils = yes])
 AC_SUBST(WY_MAILUTILS,[$status_mailutils])
 
diff --git a/tests/.gitignore b/tests/.gitignore
index 1df6b71..461469e 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -10,3 +10,4 @@ wstest
 wsbatch
 pushck
 bkupname
+nullmail
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f7a491..ebd86ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -80,7 +80,7 @@ check-local: atconfig atlocal $(TESTSUITE)
 #installcheck-local:
 #       $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 
-check_PROGRAMS = wstest wsbatch pushck bkupname
+check_PROGRAMS = wstest wsbatch pushck bkupname 
 AM_CPPFLAGS = \
  -I$(top_srcdir)/grecs/src\
  -I$(top_srcdir)/include\
@@ -90,3 +90,7 @@ LDADD=@GRECS_LDADD@
 pushck_LDADD=../src/pushd.o
 bkupname_LDADD=../src/backup.o @GRECS_LDADD@
 
+if COND_MAILUTILS
+  check_PROGRAMS += nullmail
+  nullmail_LDADD = @MAILUTILS_LIBS@
+endif
diff --git a/tests/atlocal.in b/tests/atlocal.in
index af69a75..083c968 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -12,6 +12,7 @@ WY_CONFSRC=@abs_top_srcdir@/tests/etc
 WY_DISTDIR=@abs_top_srcdir@/tests/dist
 WY_SRC=@abs_top_builddir@/tests/source
 WY_DST=@abs_top_builddir@/tests/dest
+WY_TESTDIR=@abs_top_builddir@/tests
 WY_MAILUTILS=@WY_MAILUTILS@
 MKDIR_P="@MKDIR_P@"
 
@@ -35,6 +36,7 @@ wydawca_expandmeta() {
              s,@WY_SRC@,$WY_SRC,g;
              s,@WY_DST@,$WY_DST,g;
              s,@WY_CONFSRC@,$WY_CONFSRC,g;
+             s,@WY_TESTDIR@,$WY_TESTDIR,g;
              s,@WY_MODDIR@,@abs_top_builddir@/modules/mailutils,g" $1 > $2
 }
 
diff --git a/tests/check-notify.at b/tests/check-notify.at
index 65aa8b7..fa5cbeb 100644
--- a/tests/check-notify.at
+++ b/tests/check-notify.at
@@ -43,12 +43,10 @@ wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) fini
 ])
 
 AT_DATA([outtmpl],
-[-F wydawca-noreply@localhost @USER@@localhost
-=========
+[From wydawca-noreply@localhost
 From: wydawca-noreply@localhost
 To: "Wydawca Test User" <@USER@@localhost>
 Subject: file rejected