mozilla-central: changeset 108110:5668f229dc6af6ae48d32374bd4b4e211cde7c9a

author	Ehsan Akhgari <ehsan@mozilla.com>
	Tue, 25 Sep 2012 00:17:32 -0400
changeset 108110	5668f229dc6af6ae48d32374bd4b4e211cde7c9a
parent 108109	212cf709135c0379d254036e7437c933b57fb607
child 108111	6b87b58ff491875e1d8e5462834ffe3965f22351
push id	23536
push user	eakhgari@mozilla.com
push date	Wed, 26 Sep 2012 19:07:37 +0000
treeherder	mozilla-central@5668f229dc6a [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	khuey
bugs	793953
milestone	18.0a1
first release with	nightly linux32 b038e9e2023f / 18.0a1 / 20120927030539 / files nightly linux64 b038e9e2023f / 18.0a1 / 20120927030539 / files nightly mac b038e9e2023f / 18.0a1 / 20120927030539 / files nightly win32 b038e9e2023f / 18.0a1 / 20120927030539 / files nightly win64 b038e9e2023f / 18.0a1 / 20120927030539 / files
last release without	nightly linux32 ca4af4af5334 / 18.0a1 / 20120926030625 / files nightly linux64 ca4af4af5334 / 18.0a1 / 20120926030625 / files nightly mac ca4af4af5334 / 18.0a1 / 20120926030625 / files nightly win32 ca4af4af5334 / 18.0a1 / 20120926030625 / files nightly win64 ca4af4af5334 / 18.0a1 / 20120926030625 / files

--- a/client.mk
+++ b/client.mk
@@ -55,16 +55,21 @@ else
 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
+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