[jhbuild] sanitycheck: don't check M4 if autoconf is not present (bgo#720486)

[Frederic Peters <fpeters src gnome org>]

commit f504894126f1c6f9caef89bbe7cf51e568712c17
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Sun Dec 15 14:07:08 2013 +0100

    sanitycheck: don't check M4 if autoconf is not present (bgo#720486)
    
    If autoconf is not installed, get_aclocal_path() would throw, and
    its exception would simply be printed without any indication of
    the problem. It's simply better to not check for M4 macros if
    autoconf check already failed before.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=720486

 jhbuild/commands/sanitycheck.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/commands/sanitycheck.py b/jhbuild/commands/sanitycheck.py
index d85bc46..c1e7708 100644
--- a/jhbuild/commands/sanitycheck.py
+++ b/jhbuild/commands/sanitycheck.py
@@ -60,6 +60,8 @@ class cmd_sanitycheck(Command):
                 os.access(config.prefix, os.R_OK|os.W_OK|os.X_OK)):
             uprint(_('install prefix (%s) is not writable') % config.prefix)
 
+        autoconf = True
+
         # check whether various tools are installed
         if not check_version(['libtoolize', '--version'],
                              r'libtoolize \([^)]*\) ([\d.]+)', '1.5'):
@@ -72,13 +74,14 @@ class cmd_sanitycheck(Command):
             uprint(_('%s not found') % 'pkg-config >= 0.14.0')
         if not check_version(['autoconf', '--version'],
                              r'autoconf \([^)]*\) ([\d.]+)', '2.53'):
+            autoconf = False
             uprint(_('%s not found') % 'autoconf >= 2.53')
         if not check_version(['automake', '--version'],
                              r'automake \([^)]*\) ([\d.]+)', '1.10'):
             uprint(_('%s not found') % 'automake >= 1.10')
 
-
-        self.check_m4()
+        if (autoconf):
+            self.check_m4()
 
         # XML catalog sanity checks
         if not os.access('/etc/xml/catalog', os.R_OK):