From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 12 Jul 2015 11:05:51 +0000 (+0200)
Subject: Use AC_CONFIG_MACRO_DIRS([m4]).
X-Git-Tag: release-1.1pre12~106
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=b7b5d516137713c594990cd982a29f7e5718b45b;p=tinc

Use AC_CONFIG_MACRO_DIRS([m4]).
---

diff --git a/Makefile.am b/Makefile.am
index 75eea49e..8d05fb93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ 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
diff --git a/configure.ac b/configure.ac
index 4c5c0560..f045798d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([src/tincd.c])
 AC_GNU_SOURCE
 AM_INIT_AUTOMAKE([std-options subdir-objects -Wall])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions
diff --git a/m4/README b/m4/README
deleted file mode 100644
index df032df9..00000000
--- a/m4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-These files are used by a program called aclocal (part of the GNU automake
-package).  aclocal uses these files to create aclocal.m4 which is in turn
-used by autoconf to create the configure script at the the top level in
-this distribution.
-
-The Makefile.am file in this directory is automatically generated
-from the template file, Makefile.am.in.  The generation will fail
-if you don't have all the right tools.