diff options
| author | Javier Jardón <jjardon@gnome.org> | 2013-07-23 11:53:00 +0100 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2013-10-01 14:39:18 +0100 |
| commit | 799ae3eaebd82f961cbca82325351c3b5db7494c (patch) | |
| tree | e917cbea633aa2b51165231897a8846f315a08c4 | |
| parent | daf03d618f3093b7c7ba5850fe27f9f552500a9e (diff) | |
| download | gnome-common-799ae3eaebd82f961cbca82325351c3b5db7494c.tar.gz | |
Read the dirlist file unconditionally
| -rw-r--r-- | 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 |