From 5016d57b70e4bd5e2a2f493ebb81c4d00074d351 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 3 Oct 2017 20:59:00 +0200 Subject: [PATCH] Use AC_CONFIG_MACRO_DIR(). --- Makefile.am | 2 +- configure.ac | 3 ++- m4/Makefile.am | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 m4/Makefile.am diff --git a/Makefile.am b/Makefile.am index c03d0201..735f6d5e 100644 --- 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 7f1a6718..04487078 100644 --- 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 index 1ff32a7c..00000000 --- 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 -- 2.20.1