From ee67cdc2cd7c65318d21faed1056160f8355990e Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 3 Jan 2014 15:36:05 +0100
Subject: Read the dirlist file unconditionally

Based on GNOME commit:
https://git.gnome.org/browse/gnome-common/commit/?id=799ae3eaebd82f961cbca82325351c3b5db7494c
---
 macros/mate-autogen | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/macros/mate-autogen b/macros/mate-autogen
index caf390f..cda8d3a 100644
--- a/macros/mate-autogen
+++ b/macros/mate-autogen
@@ -188,9 +188,8 @@ check_m4macros() {
     # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9
     # but it contains only Automake's own macros, so we can ignore it.
 
-    # Read the dirlist file, supported by Automake >= 1.7.
-    # If AUTOMAKE was defined, no version was detected.
-    if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
+    # Read the dirlist file
+    if [ -s $cm_macrodirs/dirlist ]; then
 	cm_dirlist=`sed 's/[ 	]*#.*//;/^$/d' $cm_macrodirs/dirlist`
 	if [ -n "$cm_dirlist" ] ; then
 	    for cm_dir in $cm_dirlist; do
-- 
cgit v1.2.1