bug 450967 - Check for alternate autoconf-2.13 names in comm-central build system, r=Standard8
authorRobert Kaiser <kairo@kairo.at>
Fri, 29 Aug 2008 14:10:59 +0200
changeset 219 85d7ed5865e8c719aa4794807d98db3aab499374
parent 218 aa2c08ec4f278e05aac0d9239fd55a6ec5f1fa4c
child 220 5e422392425a5622e130b40451c91cc4854328f4
push id194
push userkairo@kairo.at
push dateFri, 29 Aug 2008 12:12:25 +0000
treeherdercomm-central@85d7ed5865e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs450967
bug 450967 - Check for alternate autoconf-2.13 names in comm-central build system, r=Standard8
client.mk
--- a/client.mk
+++ b/client.mk
@@ -86,21 +86,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 ?= autoconf-2.13
-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