bug 450948 - Remove Mac case from AUTOCONF detection code - simple, slightly hacky, new fix, r=ted
authorRobert Kaiser <kairo@kairo.at>
Sun, 24 Aug 2008 20:02:13 +0200
changeset 18350 4cac63f5ffabfec3a7801ae8b2c5959f2385cb58
parent 18349 d98ddf4499cc13a9bab08e1cfa2cbacdf72e6e3b
child 18351 379931a16cd7e8441ac5788b63f3cf907bd6c967
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs450948
milestone1.9.1a2pre
bug 450948 - Remove Mac case from AUTOCONF detection code - simple, slightly hacky, new fix, r=ted
client.mk
--- a/client.mk
+++ b/client.mk
@@ -84,21 +84,19 @@ endif
 
 ifndef TOPSRCDIR
 ifeq (,$(wildcard client.mk))
 $(error Must run from the client.mk directory, or specify TOPSRCDIR)
 endif
 TOPSRCDIR = $(CWD)
 endif
 
-ifeq (Darwin,$(shell uname -s))
-AUTOCONF ?= autoconf213
-else
-AUTOCONF ?= $(shell which autoconf-2.13 autoconf2.13 autoconf213 | head -1)
-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)
 
 MKDIR := mkdir
 SH := /bin/sh
 ifndef MAKE
 MAKE := gmake
 endif
 PERL ?= perl
 PYTHON ?= python