Commit 799ae3ea authored by Javier Jardón's avatar Javier Jardón Committed by David King

Read the dirlist file unconditionally

parent daf03d61
...@@ -165,9 +165,8 @@ check_m4macros() { ...@@ -165,9 +165,8 @@ check_m4macros() {
# aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 # 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. # but it contains only Automake's own macros, so we can ignore it.
# Read the dirlist file, supported by Automake >= 1.7. # Read the dirlist file
# If AUTOMAKE was defined, no version was detected. if [ -s $cm_macrodirs/dirlist ]; then
if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist`
if [ -n "$cm_dirlist" ] ; then if [ -n "$cm_dirlist" ] ; then
for cm_dir in $cm_dirlist; do for cm_dir in $cm_dirlist; do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment