Bug 1256355 - Look for homebrew's autoconf213, and fix a typo. r=gps. draft
authorBlake Winton <bwinton@latte.ca>
Mon, 14 Mar 2016 11:06:53 -0400
changeset 340009 f5693c673a929267dc10394c9f3a42b3d074639b
parent 339874 f0c0480732d36153e8839c7f17394d45f679f87d
child 516113 98df18e9843410c657c1f624d4d63046cd6a0544
push id12871
push userbwinton@latte.ca
push dateMon, 14 Mar 2016 18:47:29 +0000
reviewersgps
bugs1256355
milestone48.0a1
Bug 1256355 - Look for homebrew's autoconf213, and fix a typo. r=gps. MozReview-Commit-ID: yt9fKDzZ9g
build/moz.configure/old.configure
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -50,23 +50,32 @@ def autoconf(mozconfig, autoconf):
     for ac in (mozconfig_autoconf, autoconf, 'autoconf-2.13', 'autoconf2.13',
                'autoconf213'):
         if ac:
             autoconf = find_program(ac)
             if autoconf:
                 break
     else:
         fink = find_program('fink')
-        if find:
+        if fink:
             autoconf = os.path.normpath(os.path.join(
                 fink, '..', '..', 'lib', 'autoconf2.13', 'bin', 'autoconf'))
+        else:
+            brew = find_program('brew')
+            if brew:
+                autoconf = os.path.normpath(os.path.join(
+                    brew, '..', '..', 'Cellar', 'autoconf213', '2.13', 'bin',
+                    'autoconf213'))
 
     if not autoconf:
         error('Could not find autoconf 2.13')
 
+    if not os.path.exists(autoconf):
+        error('Could not find autoconf 2.13 at %s' % (autoconf,))
+
     set_config('AUTOCONF', autoconf)
     return autoconf
 
 
 @depends('OLD_CONFIGURE', mozconfig, autoconf, check_build_environment, shell,
          old_configure_assignments)
 @advanced
 def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell,