Use AC_CONFIG_MACRO_DIR().

diff --git a/Makefile.am b/Makefile.am
index c03d02012060d1029a08f4ff6a3ff83c27bfe1ad..735f6d5ecafde3f55e09bfab23756942b45ffc78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 src doc distro
+SUBDIRS = src doc distro
 
 ACLOCAL_AMFLAGS = -I m4 
 

diff --git a/configure.ac b/configure.ac
index 7f1a671843b87378f9214a284194bd95198c140a..04487078df1812050f25aa34efd6eaf2e195704b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([tinc], [1.0.32])
 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc silent-rules -Wall info-in-builddir])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 AM_SILENT_RULES([yes])
 
@@ -252,6 +253,6 @@ AC_ARG_ENABLE(jumbograms,
   ]
 )
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile distro/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile distro/Makefile])
 
 AC_OUTPUT

diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644 (file)
index 1ff32a7..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-## Process this file with automake to produce Makefile.in   -*-Makefile-*-
-
-EXTRA_DIST = README attribute.m4 ax_append_flag.m4 ax_cflags_warn_all.m4 ax_check_compile_flag.m4 ax_check_link_flag.m4 ax_require_defined.m4 lzo.m4 openssl.m4 zlib.m4