From f1614e7c34bb22c374c234e7c9565b4ef628bd5b Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Fri, 6 Dec 2019 11:51:55 +0200
Subject: Build package.m4 in Makefile

The decision to build package.m4 in config.status makes proper
maintenance of the file problematic.  It is reverted.

This patch also uses colon-separated VPATH for compatibility with
other make implementations.

* configure.ac: Don't build package.m4
* testsuite/Makefile.am: Do it here.
* libmailutils/tests/Makefile.am: Use colon-separated VPATH for
compatibility with BSD make.
* testsuite/package.m4.in: Remove.
---
 configure.ac                   |  1 -
 libmailutils/tests/Makefile.am |  2 +-
 testsuite/Makefile.am          | 16 ++++++++++++++--
 testsuite/package.m4.in        |  6 ------
 4 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 testsuite/package.m4.in

diff --git a/configure.ac b/configure.ac
index 7dcfeeeab..575ff22f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1358,7 +1358,6 @@ AC_CONFIG_FILES([include/mailutils/types.h:include/mailutils/types.hin])
 AC_CONFIG_TESTDIR(testsuite)
 AC_CONFIG_FILES([testsuite/Makefile testsuite/atlocal])
 
-AC_CONFIG_FILES([testsuite/package.m4])
 MU_CONFIG_TESTSUITE(libmailutils)
 MU_CONFIG_TESTSUITE(frm)
 MU_CONFIG_TESTSUITE(mda/lmtpd)
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index 51a24e92f..f0f7ff034 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -200,5 +200,5 @@ noinst_PROGRAMS += wsp
 wsp_SOURCES = 
 nodist_wsp_SOURCES = wsp.c
 wsp.o: $(srcdir)/wordsplit-version.h
-VPATH += $(top_srcdir)/libmailutils/wordsplit
+VPATH = $(srcdir):$(top_srcdir)/libmailutils/wordsplit
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 432c36a04..4ac273d22 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -16,10 +16,8 @@
 
 include $(srcdir)/testsuite.am
 
-DISTCLEANFILES       += package.m4
 EXTRA_DIST += \
  package.m4 \
- package.m4.in \
  testsuite.inc\
  testsuite.am\
  lib\
@@ -29,6 +27,20 @@ EXTRA_DIST += \
  maildir\
  mh 
 
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	$(AM_V_GEN){                                      \
+          echo '# Signature of the current package.'; \
+          echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+          echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+          echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+          echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+        } >$(srcdir)/package.m4
+
 ## -------------------------- ##
 ## Non-installable programs
 ## -------------------------- ##
diff --git a/testsuite/package.m4.in b/testsuite/package.m4.in
deleted file mode 100644
index a9bd74a90..000000000
--- a/testsuite/package.m4.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# Signature of the current package.
-m4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])
-m4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])
-m4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])
-m4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])
-m4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])
-- 
cgit v1.2.1