[gnome-common] Read the dirlist file unconditionally

[David King <davidk src gnome org>]

commit 799ae3eaebd82f961cbca82325351c3b5db7494c
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Jul 23 11:53:00 2013 +0100

    Read the dirlist file unconditionally

 macros2/gnome-autogen.sh |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index ee4b937..b33b78d 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -165,9 +165,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