Bug 1256355 - Look for homebrew's autoconf213, and fix a typo. r=gps.
MozReview-Commit-ID: yt9fKDzZ9g
--- 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,