From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 24 Sep 2015 15:10:25 +0000 (+0200)
Subject: Add -I m4 back to ACLOCAL_AMFLAGS.
X-Git-Tag: release-1.1pre12~96
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=5ad43673acf03f86643f1463f1ebfa6e9ca189cc

Add -I m4 back to ACLOCAL_AMFLAGS.

In commit b7b5d51, AC_CONFIG_MACRO_DIRS([m4]) was added to configure.ac,
which is the current proper way of including the m4 directory. However,
old versions of autoconf ignore it and need the -I m4 statement in
Makefile.am. Both the old and new way of indicating that the m4/
directory should be included can coexist.
---

diff --git a/Makefile.am b/Makefile.am
index 8d05fb93..c0014d50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = gnu
 
 SUBDIRS =  src doc gui test
 
+ACLOCAL_AMFLAGS = -I m4
+
 EXTRA_DIST = COPYING.README README.android
 
 # If git describe works, force autoconf to run in order to make sure we have the