[Commits] [SCM] claws branch, master, updated. 4.1.1-17-gb8b9a2986

[jonathan at claws-mail.org]

The branch, master has been updated
       via  b8b9a29860f58848fff9e7e4e5fd378cbec78a7f (commit)
      from  6b35a38746b56e200562f8684493ec83c38a3d59 (commit)

Summary of changes:
 Makefile.am    |  3 ++-
 configure.ac   |  1 -
 m4/Makefile.am | 15 ---------------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 m4/Makefile.am


- Log -----------------------------------------------------------------
commit b8b9a29860f58848fff9e7e4e5fd378cbec78a7f
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Nov 27 15:13:17 2022 -0700

    Make m4 an EXTRA_DIST rather than a SUBDIR

diff --git a/Makefile.am b/Makefile.am
index 96d57b16f..b9af385a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ endif
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
-SUBDIRS = m4 po src tools config doc manual
+SUBDIRS = po src tools config doc manual
 
 EXTRA_DIST = \
 	ChangeLog \
@@ -27,6 +27,7 @@ EXTRA_DIST = \
 	autogen.sh \
 	claws-features.h.in \
 	get-git-version \
+	m4 \
 	version
 
 # hicolor icon theme, base class of all icon themes
diff --git a/configure.ac b/configure.ac
index b8ce2cc19..993fe5e69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2174,7 +2174,6 @@ dnl ****************************
 
 AC_CONFIG_FILES([
 Makefile
-m4/Makefile
 po/Makefile.in
 src/common/version.h
 src/Makefile
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 52591d4b6..000000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 the Claws Mail team.
-# This file is part of Claws Mail package, and distributed under the
-# terms of the General Public License version 3 (or later).
-# See COPYING file for license details.
-
-MACROS = \
-	check-type.m4 \
-	gnupg-check-typedef.m4 \
-	aspell.m4 \
-	spamassassin.m4 \
-        gnupg.m4
-
-EXTRA_DIST = codeset.m4 glibc21.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 glibc2.m4 $(MACROS)
-
-.PHONY: test

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


hooks/post-receive
-- 
Claws Mail