Backed out changeset 6b87b58ff491 (follow-up to bug 793953) because of make insanity
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 26 Sep 2012 15:47:11 -0400
changeset 114410 a425ea4f16c947ab198f5329165cf6582b50cc4f
parent 114409 6b87b58ff491875e1d8e5462834ffe3965f22351
child 114466 ec079fd92224ad7ad835cce297781a2b6334cc40
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs793953
milestone18.0a1
backs out6b87b58ff491875e1d8e5462834ffe3965f22351
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 6b87b58ff491 (follow-up to bug 793953) because of make insanity DONTBUILD this, like the ones before it
client.mk
--- a/client.mk
+++ b/client.mk
@@ -56,17 +56,19 @@ TOPSRCDIR := $(CWD)
 endif
 endif
 
 # try to find autoconf 2.13 - discard errors from 'which'
 # MacOS X 10.4 sends "no autoconf*" errors to stdout, discard those via grep
 AUTOCONF ?= $(shell which autoconf-2.13 autoconf2.13 autoconf213 2>/dev/null | grep -v '^no autoconf' | head -1)
 
 # See if the autoconf package was installed through fink
-AUTOCONF ?= $(shell which fink >/dev/null 2>&1 && echo `which fink`/../../lib/autoconf2.13/bin/autoconf)
+ifeq (,$(strip $(AUTOCONF)))
+AUTOCONF = $(shell which fink >/dev/null 2>&1 && echo `which fink`/../../lib/autoconf2.13/bin/autoconf)
+endif
 
 ifeq (,$(strip $(AUTOCONF)))
 AUTOCONF=$(error Could not find autoconf 2.13)
 endif
 
 SH := /bin/sh
 PERL ?= perl
 PYTHON ?= python