From a354635eca1a17b9f661973c43e154521284daa9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 14 Dec 2011 18:33:59 +0000
Subject: [PATCH] drop old M4DIR support since we have AT_M4DIR and the tree
 uses only that, and note GNU m4 as a requirement

---
 eclass/autotools.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 6750dd12b424..ccd4ff79fbe2 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.113 2011/12/13 21:57:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.114 2011/12/14 18:33:59 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -10,6 +10,9 @@
 # This eclass is for safely handling autotooled software packages that need to
 # regenerate their build scripts.  All functions will abort in case of errors.
 
+# Note: We require GNU m4, as does autoconf.  So feel free to use any features
+# from the GNU version of m4 without worrying about other variants (i.e. BSD).
+
 if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
 
@@ -102,11 +105,10 @@ unset _automake_atom _autoconf_atom
 # useful when elibtoolize needs to be ran with
 # particular options
 
-# XXX: M4DIR should be deprecated
 # @ECLASS-VARIABLE: AT_M4DIR
 # @DESCRIPTION:
 # Additional director(y|ies) aclocal should search
-: ${AT_M4DIR:=${M4DIR}}
+: ${AT_M4DIR:=}
 
 # @ECLASS-VARIABLE: AT_SYS_M4DIR
 # @INTERNAL
-- 
2.26.2