merge backout
authorRobert Kaiser <kairo@kairo.at>
Mon, 18 Aug 2008 17:11:24 +0200
changeset 132 a0e1e5b5a20d85b28a2f9505197fcaee2c1d127f
parent 129 13eae6fc3733db9c5a6b0f290dd703930bb57975 (current diff)
parent 131 5dd97780d577ed346d9cf5198fbd4f05fd6c0f0b (diff)
child 133 477d7ede8e4015ed8d4535c31fbe4e8a0882e585
push idunknown
push userunknown
push dateunknown
merge backout
--- a/client.mk
+++ b/client.mk
@@ -86,17 +86,21 @@ endif
 
 ifndef TOPSRCDIR
 ifeq (,$(wildcard client.mk))
 $(error Must run from the client.mk directory, or specify TOPSRCDIR)
 endif
 TOPSRCDIR = $(CWD)
 endif
 
-AUTOCONF ?= $(shell which autoconf-2.13 autoconf2.13 autoconf213 | head -1)
+ifeq (Darwin,$(shell uname -s))
+AUTOCONF ?= autoconf213
+else
+AUTOCONF ?= autoconf-2.13
+endif
 
 MKDIR := mkdir
 SH := /bin/sh
 ifndef MAKE
 MAKE := gmake
 endif
 PERL ?= perl
 PYTHON ?= python