summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@fb.com>2014-09-06 21:07:57 -0700
committerJim Meyering <meyering@fb.com>2014-11-30 18:59:33 -0800
commit2f5510153ee9961fddf344459b2dc9e67cda3d67 (patch)
tree985ad99656f7a5b2cabcfa932e6d98f2cc79b8ad
parentb741f318d0d8955806d7020efdc7c7dc8fccff36 (diff)
downloadsed-2f5510153ee9961fddf344459b2dc9e67cda3d67.tar.gz
maint: remove ACLOCAL_AMFLAGS in favor of AC_CONFIG_MACRO_DIRS
* Makefile.am (ACLOCAL_AMFLAGS): Remove this assignment. * configure.ac: Use this macro instead.
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index cdf5db4..a198e95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Automake requirements
-ACLOCAL_AMFLAGS = -I m4
-
PACKAGE = sed
SUBDIRS = lib po sed doc testsuite
diff --git a/configure.ac b/configure.ac
index 4eec46e..3918194 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AM_CONFIG_HEADER(config.h:config_h.in)
AC_PREREQ(2.62)
AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz color-tests parallel-tests])
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
+AC_CONFIG_MACRO_DIRS([m4])
SED_FEATURE_VERSION=4.2.2
AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION",