# HG changeset patch
# User Ben Schmidt
# Date 1495666233 -36000
# Node ID bba3a46fee47bc0b724d4a5e2c0cdc8e4dfa677d
# Parent  feccd8b0b68f5e0864be732f646400073f461146
Improve compatibility with recent versions of Automake.

diff -r feccd8b0b68f -r bba3a46fee47 .hgignore
--- a/.hgignore	Mon Oct 03 00:43:52 2016 +1100
+++ b/.hgignore	Thu May 25 08:50:33 2017 +1000
@@ -1,5 +1,5 @@
 # Use regular expressions for following lines
-regex:
+syntax: regexp
 
 # Files generated by autoconf -if
 ^depcomp$
@@ -30,6 +30,7 @@
 ^src/mlmmj-send$
 ^src/mlmmj-sub$
 ^src/mlmmj-unsub$
+^contrib/receivestrip/mlmmj_src/
 
 # Other generated files
 (^|/)TAGS$
diff -r feccd8b0b68f -r bba3a46fee47 configure.ac
--- a/configure.ac	Mon Oct 03 00:43:52 2016 +1100
+++ b/configure.ac	Thu May 25 08:50:33 2017 +1000
@@ -1,10 +1,10 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(mlmmj, esyscmd([tr -d '\n' < VERSION]), mmj@mmj.dk)
+AC_INIT(mlmmj, esyscmd([tr -d '\n' < VERSION]), maintainer@mlmmj.org)
 
 VERSION=$PACKAGE_VERSION
 AC_SUBST(VERSION)
 
-AM_INIT_AUTOMAKE(mlmmj, $VERSION)
+AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR([src/mlmmj-receive.c])
 AM_CONFIG_HEADER([config.h])
 
diff -r feccd8b0b68f -r bba3a46fee47 contrib/receivestrip/Makefile.am
--- a/contrib/receivestrip/Makefile.am	Mon Oct 03 00:43:52 2016 +1100
+++ b/contrib/receivestrip/Makefile.am	Thu May 25 08:50:33 2017 +1000
@@ -2,13 +2,18 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"'
-INCLUDES = -I$(srcdir)/../../include
+AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"' -I$(srcdir)/../../include
 
 if WANT_RECEIVESTRIP
   bin_PROGRAMS = mlmmj-receive-strip
 endif
 
-mlmmj_receive_strip_SOURCES = mlmmj-receive-strip.c ../../src/mygetline.c ../../src/memory.c ../../src/readn.c  \
-				../../src/strgen.c ../../src/random-int.c  ../../src/log_error.c ../../src/print-version.c \
-				../../src/writen.c ../../src/dumpfd2fd.c ../../src/ctrlvalues.c ../../src/chomp.c
+MLMMJ_SOURCES = mlmmj_src/mygetline.c mlmmj_src/memory.c mlmmj_src/readn.c  \
+		mlmmj_src/strgen.c mlmmj_src/random-int.c mlmmj_src/log_error.c \
+		mlmmj_src/print-version.c mlmmj_src/writen.c mlmmj_src/dumpfd2fd.c \
+		mlmmj_src/ctrlvalues.c mlmmj_src/chomp.c
+
+mlmmj_receive_strip_SOURCES = mlmmj-receive-strip.c $(MLMMJ_SOURCES)
+
+mlmmj_src/%.c:
+	ln -s ../../../src/$*.c $@
diff -r feccd8b0b68f -r bba3a46fee47 src/Makefile.am
--- a/src/Makefile.am	Mon Oct 03 00:43:52 2016 +1100
+++ b/src/Makefile.am	Thu May 25 08:50:33 2017 +1000
@@ -2,8 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"'
-INCLUDES = -I$(srcdir)/../include
+AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"' -I$(srcdir)/../include
 
 bin_PROGRAMS = mlmmj-send mlmmj-receive mlmmj-process mlmmj-sub \
                mlmmj-unsub mlmmj-bounce mlmmj-maintd mlmmj-list