From efbe755a36f43d1aad7e02c90821a10c40b30b00 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 7 Mar 2013 10:27:35 +0000
Subject: [PATCH] help bootstrap on OS X

---
 bootstrap.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 547924fb..a58167ae 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,7 +18,15 @@ rm -f benchmark/temp*
 # glib-gettextize asks us to copy these files to m4 if they aren't there
 # I don't have $ACDIR/isc-posix.m4, how mysterious
 ACDIR=`aclocal --print-ac-dir`
-mkdir m4
+
+# OS X with brew sets ACDIR to
+# /usr/local/Cellar/automake/1.13.1/share/aclocal, the staging area, which is
+# totally wrong argh
+if [ ! -f $ACDIR ]; then
+	ACDIR=/usr/local/share/aclocal
+fi
+
+mkdir -p m4
 cp $ACDIR/codeset.m4 m4
 cp $ACDIR/gettext.m4 m4
 cp $ACDIR/glibc21.m4 m4