summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-01-03 15:36:05 +0100
committerinfirit <[email protected]>2014-01-03 15:36:05 +0100
commitee67cdc2cd7c65318d21faed1056160f8355990e (patch)
tree816b3e60b51dc077dce315b45186cea16817f160 /macros
parenta1bbc3ba85d9f62c759ff9168fce150868c29dc9 (diff)
downloadmate-common-ee67cdc2cd7c65318d21faed1056160f8355990e.tar.bz2
mate-common-ee67cdc2cd7c65318d21faed1056160f8355990e.tar.xz
Read the dirlist file unconditionally
Based on GNOME commit: https://git.gnome.org/browse/gnome-common/commit/?id=799ae3eaebd82f961cbca82325351c3b5db7494c
Diffstat (limited to 'macros')
-rw-r--r--macros/mate-autogen5
1 files 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